Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu_coords macro for (x1, y1, x2, y2) order (see issue #440)

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-13 16:38:14 -05:00
parent 0197e6f23c
commit 2ab60fa8a4
47 changed files with 150 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/mobile_12.asm
View File

@@ -564,8 +564,7 @@ MobileDesc_ZipCode: db "Your zip code?@"
MenuDataHeader_0x484f1: ; 0x484f1
db $40 ; flags
db 02, 11 ; start coords
db 07, 19 ; end coords
menu_coords 11, 2, SCREEN_WIDTH - 1, 7
dw MenuData2_0x484f9
db 1 ; default option
; 0x484f9
@@ -580,23 +579,19 @@ String_484ff: db "Girl@"
MenuDataHeader_0x48504: ; 0x48504
db $40 ; flags
db 00, 10 ; start coords
db 17, 19 ; end coords
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
MenuDataHeader_0x48509: ; 0x48509
db $40 ; flags
db 05, 10 ; start coords
db 07, 19 ; end coords
menu_coords 10, 5, SCREEN_WIDTH - 1, 7
MenuDataHeader_0x4850e: ; 0x4850e
db $40 ; flags
db 09, 10 ; start coords
db 11, 19 ; end coords
menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
MenuDataHeader_0x48513: ; 0x48513
db $40 ; flags
db 01, 11 ; start coords
db 12, 18 ; end coords
menu_coords 11, 1, 18, 12
dw MenuData2_0x4851b
db 1 ; default option
; 0x4851b
@@ -1278,8 +1273,7 @@ Function48a9a: ; 48a9a (12:4a9a)
MenuDataHeader_0x48a9c: ; 0x48a9c
db $40 ; flags
db 08, 10 ; start coords
db 13, 19 ; end coord
menu_coords 10, 8, SCREEN_WIDTH - 1, 13
String_48aa1: ; 48aa1
db "Tell Now"

3
mobile/mobile_12_2.asm
View File

@@ -716,8 +716,7 @@ Function4ac58: ; 4ac58
MenuDataHeader_0x4aca2: ; 0x4aca2
db $40 ; flags
db 09, 11 ; start coords
db 17, 19 ; end coords
menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 1 ; default option
; 0x4acaa

24
mobile/mobile_22.asm
View File

@@ -278,8 +278,7 @@ Function89261: ; 89261
MenuDataHeader_0x892a3: ; 0x892a3
db $40 ; flags
db 05, 10 ; start coords
db 09, 15 ; end coords
menu_coords 10, 5, 15, 9
dw MenuData2_0x892ab
db 1 ; default option
; 0x892ab
@@ -2833,8 +2832,7 @@ Function8a116: ; 8a116 (22:6116)
MenuDataHeader_0x8a176: ; 0x8a176
db $40 ; flags
db 00, 14 ; start coords
db 06, 19 ; end coords
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
; 8a17b
Function8a17b: ; 8a17b (22:617b)
@@ -2856,8 +2854,7 @@ Function8a17b: ; 8a17b (22:617b)
MenuDataHeader_0x8a19a: ; 0x8a19a
db $40 ; flags
db 00, 14 ; start coords
db 06, 19 ; end coords
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
dw MenuData2_0x8a1a2
db 1 ; default option
; 0x8a1a2
@@ -3016,8 +3013,7 @@ Function8a2aa: ; 8a2aa (22:62aa)
MenuDataHeader_0x8a2ef: ; 0x8a2ef
db $40 ; flags
db 12, 00 ; start coords
db 17, 19 ; end coords
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
; 8a2f4
UnknownText_0x8a2f4: ; 0x8a2f4
@@ -3178,8 +3174,7 @@ Unknown_8a40b: db 1, 2, 3, -1
MenuDataHeader_0x8a40f: ; 0x8a40f
db $40 ; flags
db 02, 00 ; start coords
db 11, 10 ; end coords
menu_coords 0, 2, 10, TEXTBOX_Y - 1
dw MenuData2_0x8a417
db 1 ; default option
; 0x8a417
@@ -3195,8 +3190,7 @@ MenuData2_0x8a417: ; 0x8a417
MenuDataHeader_0x8a435: ; 0x8a435
db $40 ; flags
db 02, 00 ; start coords
db 09, 10 ; end coords
menu_coords 0, 2, 10, 9
dw MenuData2_0x8a43d
db 1 ; default option
; 0x8a43d
@@ -3921,8 +3915,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5)
MenuDataHeader_0x8a9c9: ; 0x8a9c9
db $40 ; flags
db 04, 11 ; start coords
db 11, 18 ; end coords
menu_coords 11, 4, 18, TEXTBOX_Y - 1
; 8a9ce
Function8a9ce: ; 8a9ce (22:69ce)
@@ -3951,8 +3944,7 @@ Function8a9ce: ; 8a9ce (22:69ce)
MenuDataHeader_0x8a9f2: ; 0x8a9f2
db $40 ; flags
db 04, 11 ; start coords
db 11, 18 ; end coords
menu_coords 11, 4, 18, TEXTBOX_Y - 1
dw MenuData2_0x8a9fa
db 1 ; default option
; 0x8a9fa

12
mobile/mobile_22_2.asm
View File

@@ -911,8 +911,7 @@ Function8b855: ; 8b855
MenuDataHeader_0x8b867: ; 0x8b867
db $40 ; flags
db 03, 01 ; start coords
db 13, 18 ; end coords
menu_coords 1, 3, 18, 13
dw MenuData2_0x8b870
db 1 ; default option
; 0x8b86f
@@ -1084,13 +1083,11 @@ Function8b9ab: ; 8b9ab
MenuDataHeader_0x8b9ac: ; 0x8b9ac
db $40 ; flags
db 00, 11 ; start coords
db 11, 19 ; end coords
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
MenuDataHeader_0x8b9b1: ; 0x8b9b1
db $40 ; flags
db 00, 11 ; start coords
db 07, 19 ; end coords
menu_coords 11, 0, SCREEN_WIDTH - 1, 7
dw MenuData2_0x8b9b9
db 1 ; default option
; 0x8b9b9
@@ -1105,8 +1102,7 @@ MenuData2_0x8b9b9: ; 0x8b9b9
MenuDataHeader_0x8b9ca: ; 0x8b9ca
db $40 ; flags
db 00, 11 ; start coords
db 11, 19 ; end coords
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_0x8b9d2
db 1 ; default option
; 0x8b9d2

12
mobile/mobile_40.asm
View File

@@ -2120,8 +2120,7 @@ Function100d67: ; 100d67
.MenuDataHeader: ; 100d88
db 0 ; flags
db 11, 11 ; start coords
db 17, 19 ; end coords
menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2
db 1 ; default option
@@ -6288,8 +6287,7 @@ Function1029af: ; 1029af
MenuDataHeader_1029bb: ; 1029bb
db $40 ; flags
db 10, 3 ; start coords
db 12, 15 ; end coords
menu_coords 3, 10, 15, 12
dw NULL
db 1 ; default option
; 1029c3
@@ -7786,8 +7784,7 @@ AskMobileOrCable: ; 103612
MenuDataHeader_103640: ; 103640
db $40 ; flags
db 6, 13 ; start coords
db 11, 19 ; end coords
menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_103648
db 1 ; default option
@@ -7941,8 +7938,7 @@ Function103700: ; 103700
MenuDataHeader_103747: ; 103747
db $40 ; flags
db 5, 13 ; start coords
db 11, 19 ; end coords
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_10374f
db 1 ; default option

24
mobile/mobile_45.asm
View File

@@ -7298,16 +7298,14 @@ Function1179a7: ; 1179a7 (45:79a7)
MenuDataHeader_1179b5: ; 1179b5
db $40 ; flags
db 12, 0 ; start coords
db 17, 19 ; end coords
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 1179bd
MenuDataHeader_1179bd: ; 1179bd
db $40 ; flags
db 7, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
; 1179c5
@@ -7658,18 +7656,16 @@ Function117c89:
ret
MenuDataHeader_117cbc: ; 0x117cbc
db $40 ; flags
db 12, 0 ; start coords
db 17, 19 ; end coords
dw NULL ; menu data 2
db 0 ; default option
db $40 ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
MenuDataHeader_117cc4: ; 0x117cc4
db $40 ; flags
db 7, 14 ; start coords
db 11, 19 ; end coords
dw NULL ; menu data 2
db 0 ; default item
db $40 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default item
YesNo117ccc: ; 0x117ccc
db "はい"

3
mobile/mobile_45_sprite_engine.asm
View File

@@ -508,8 +508,7 @@ Function1161d5: ; 1161d5
MenuDataHeader_11628c: ; 11628c
db $40 ; flags
db 6, 0 ; start coords
db 17, 19 ; end coords
menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 116294

24
mobile/mobile_46.asm
View File

@@ -3956,16 +3956,14 @@ BattleTowerRoomMenu_UpdateYesNoMenu:
MenuDataHeader_119cf7: ; 119cf7
db $40 ; flags
db 7, 12 ; start coords
db 11, 19 ; end coords
menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
; 119cff
MenuData_119cff: ; 119cff
db $40 ; flags
db 7, 15 ; start coords
db 11, 19 ; end coords
menu_coords 15, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
; 119d07
@@ -4758,16 +4756,14 @@ String_11a2d3: ; 11a2d3
MenuDataHeader_11a2d6: ; 11a2d6
db $40 ; flags
db 6, 14 ; start coords
db 10, 19 ; end coords
menu_coords 14, 6, SCREEN_WIDTH - 1, 10
dw NULL
db 0 ; default option
; 11a2de
MenuDataHeader_11a2de: ; 11a2de
db $40 ; flags
db 7, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
; 11a2e6
@@ -5330,8 +5326,7 @@ String_11a7f4: ; 11a7f4
MenuDataHeader_11a804: ; 11a804
db $40 ; flags
db 0, 0 ; start coords
db 5, 19 ; end coords
menu_coords 0, 0, SCREEN_WIDTH - 1, 5
dw NULL
db 0 ; default option
; 11a80c
@@ -6002,8 +5997,7 @@ Function11adc4:
MenuDataHeader_11ae38: ; 11ae38
db $40 ; flags
db 10, 10 ; start coords
db 17, 17 ; end coords
menu_coords 10, 10, 17, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 11ae40
@@ -6249,8 +6243,7 @@ Function11afd6: ; 11afd6
MenuDataHeader_11afe8: ; 11afe8
db $40 ; flags
db 12, 9 ; start coords
db 17, 19 ; end coords
menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 11aff0
@@ -6267,8 +6260,7 @@ String_11b003: ; 11b003
MenuDataHeader_11b013: ; 11b013
db $40 ; flags
db 7, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 1 ; default option
; 11b01b

3
mobile/mobile_5c.asm
View File

@@ -673,8 +673,7 @@ Function171c66: ; 171c66 (5c:5c66)
MenuDataHeader_171c6b: ; 171c6b
db $40 ; flags
db 12, 0 ; start coords
db 17, 19 ; end coords
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 171c73

6
mobile/mobile_5f.asm
View File

@@ -484,8 +484,7 @@ Function17d246: ; 17d246
MenuDataHeader_17d26a: ; 17d26a
db $40 ; flags
db 0, 0 ; start coords
db 9, 14 ; end coords
menu_coords 0, 0, 14, 9
dw MenuData2_17d272
db 1 ; default option
@@ -500,8 +499,7 @@ MenuData2_17d272: ; 17d272
MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
db $40 ; flags
db 0, 0 ; start coords
db 7, 14 ; end coords
menu_coords 0, 0, 14, 7
dw MenuData2_ChallengeExplanationCancel
db 1 ; default option

6
mobile/mobile_menu.asm
View File

@@ -462,8 +462,7 @@ Function4a28a: ; 4a28a (12:628a)
MenuDataHeader_0x4a346: ; 0x4a346
db $40 ; flags
db 00, 12 ; start coords
db 06, 19 ; end coords
menu_coords 12, 0, SCREEN_WIDTH - 1, 6
String_4a34b: ; 4a34b
db "いれなおす"
@@ -485,8 +484,7 @@ UnknownText_0x4a35d: ; 0x4a35d
DeletePassword_YesNo_MenuDataHeader: ; 0x4a362
db $40 ; flags
db 07, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_0x4a36a
db 2 ; default option
; 0x4a36a