diff options
Diffstat (limited to 'mobile')
-rwxr-xr-x | mobile/mobile_12.asm | 16 | ||||
-rwxr-xr-x | mobile/mobile_12_2.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 26 | ||||
-rw-r--r-- | mobile/mobile_22_2.asm | 14 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 20 | ||||
-rw-r--r-- | mobile/mobile_45.asm | 8 | ||||
-rwxr-xr-x | mobile/mobile_45_sprite_engine.asm | 2 | ||||
-rwxr-xr-x | mobile/mobile_46.asm | 16 | ||||
-rwxr-xr-x | mobile/mobile_5c.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 10 | ||||
-rwxr-xr-x | mobile/mobile_menu.asm | 6 |
11 files changed, 61 insertions, 61 deletions
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 14b787645..238d8a3f7 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -563,7 +563,7 @@ MobileDesc_ZipCode: db "Your zip code?@" ; 484f1 MenuDataHeader_0x484f1: ; 0x484f1 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 11 ; start coords db 07, 19 ; end coords dw MenuData2_0x484f9 @@ -571,7 +571,7 @@ MenuDataHeader_0x484f1: ; 0x484f1 ; 0x484f9 MenuData2_0x484f9: ; 0x484f9 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 2 ; items Strings_484fb: String_484fb: db "Boy@" @@ -579,22 +579,22 @@ String_484ff: db "Girl@" ; 0x48504 MenuDataHeader_0x48504: ; 0x48504 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 10 ; start coords db 17, 19 ; end coords MenuDataHeader_0x48509: ; 0x48509 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 10 ; start coords db 07, 19 ; end coords MenuDataHeader_0x4850e: ; 0x4850e - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 09, 10 ; start coords db 11, 19 ; end coords MenuDataHeader_0x48513: ; 0x48513 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 01, 11 ; start coords db 12, 18 ; end coords dw MenuData2_0x4851b @@ -602,7 +602,7 @@ MenuDataHeader_0x48513: ; 0x48513 ; 0x4851b MenuData2_0x4851b: ; 0x4851b - db $1d ; flags + db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items Unknown_4851d: ; 4851d @@ -1277,7 +1277,7 @@ Function48a9a: ; 48a9a (12:4a9a) ; 48a9c (12:4a9c) MenuDataHeader_0x48a9c: ; 0x48a9c - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 08, 10 ; start coords db 13, 19 ; end coord diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index ba663cf86..94eeb6a7a 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -715,7 +715,7 @@ Function4ac58: ; 4ac58 ; 4aca2 MenuDataHeader_0x4aca2: ; 0x4aca2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 09, 11 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 9180c29e0..70de1f767 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -277,7 +277,7 @@ Function89261: ; 89261 ; 892a3 MenuDataHeader_0x892a3: ; 0x892a3 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 10 ; start coords db 09, 15 ; end coords dw MenuData2_0x892ab @@ -285,7 +285,7 @@ MenuDataHeader_0x892a3: ; 0x892a3 ; 0x892ab MenuData2_0x892ab: ; 0x892ab - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "はい@" db "いいえ@" @@ -2832,7 +2832,7 @@ Function8a116: ; 8a116 (22:6116) ; 8a176 (22:6176) MenuDataHeader_0x8a176: ; 0x8a176 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 14 ; start coords db 06, 19 ; end coords ; 8a17b @@ -2855,7 +2855,7 @@ Function8a17b: ; 8a17b (22:617b) ; 8a19a (22:619a) MenuDataHeader_0x8a19a: ; 0x8a19a - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 14 ; start coords db 06, 19 ; end coords dw MenuData2_0x8a1a2 @@ -2863,7 +2863,7 @@ MenuDataHeader_0x8a19a: ; 0x8a19a ; 0x8a1a2 MenuData2_0x8a1a2: ; 0x8a1a2 - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 3 ; items db "ひらく@" db "すてる@" @@ -3015,7 +3015,7 @@ Function8a2aa: ; 8a2aa (22:62aa) ; 8a2ef (22:62ef) MenuDataHeader_0x8a2ef: ; 0x8a2ef - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 00 ; start coords db 17, 19 ; end coords ; 8a2f4 @@ -3177,7 +3177,7 @@ Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 MenuDataHeader_0x8a40f: ; 0x8a40f - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 10 ; end coords dw MenuData2_0x8a417 @@ -3185,7 +3185,7 @@ MenuDataHeader_0x8a40f: ; 0x8a40f ; 0x8a417 MenuData2_0x8a417: ; 0x8a417 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 ; items db "めいしりスト@" db "じぶんの めいし@" @@ -3194,7 +3194,7 @@ MenuData2_0x8a417: ; 0x8a417 ; 0x8a435 MenuDataHeader_0x8a435: ; 0x8a435 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 09, 10 ; end coords dw MenuData2_0x8a43d @@ -3202,7 +3202,7 @@ MenuDataHeader_0x8a435: ; 0x8a435 ; 0x8a43d MenuData2_0x8a43d: ; 0x8a43d - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "めいしりスト@" db "じぶんの めいし@" @@ -3920,7 +3920,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5) ; 8a9c9 (22:69c9) MenuDataHeader_0x8a9c9: ; 0x8a9c9 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 11 ; start coords db 11, 18 ; end coords ; 8a9ce @@ -3950,7 +3950,7 @@ Function8a9ce: ; 8a9ce (22:69ce) ; 8a9f2 (22:69f2) MenuDataHeader_0x8a9f2: ; 0x8a9f2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 11 ; start coords db 11, 18 ; end coords dw MenuData2_0x8a9fa @@ -3958,7 +3958,7 @@ MenuDataHeader_0x8a9f2: ; 0x8a9f2 ; 0x8a9fa MenuData2_0x8a9fa: ; 0x8a9fa - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" db "みる@" diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 37b3d60b8..e30e52ee7 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -910,7 +910,7 @@ Function8b855: ; 8b855 ; 8b867 MenuDataHeader_0x8b867: ; 0x8b867 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 03, 01 ; start coords db 13, 18 ; end coords dw MenuData2_0x8b870 @@ -920,7 +920,7 @@ MenuDataHeader_0x8b867: ; 0x8b867 db 0 MenuData2_0x8b870: ; 0x8b870 - db $3c ; flags + db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags db 5 ; items db 3, 1 dbw 0, wd002 @@ -1083,12 +1083,12 @@ Function8b9ab: ; 8b9ab ; 8b9ac MenuDataHeader_0x8b9ac: ; 0x8b9ac - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 11, 19 ; end coords MenuDataHeader_0x8b9b1: ; 0x8b9b1 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 07, 19 ; end coords dw MenuData2_0x8b9b9 @@ -1096,7 +1096,7 @@ MenuDataHeader_0x8b9b1: ; 0x8b9b1 ; 0x8b9b9 MenuData2_0x8b9b9: ; 0x8b9b9 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" ; EDIT db "いれかえ@" ; REPLACE @@ -1104,7 +1104,7 @@ MenuData2_0x8b9b9: ; 0x8b9b9 ; 0x8b9ca MenuDataHeader_0x8b9ca: ; 0x8b9ca - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 11, 19 ; end coords dw MenuData2_0x8b9d2 @@ -1112,7 +1112,7 @@ MenuDataHeader_0x8b9ca: ; 0x8b9ca ; 0x8b9d2 MenuData2_0x8b9d2: ; 0x8b9d2 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 5 ; items db "みる@" ; VIEW db "へんしゅう@" ; EDIT diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 84be87ce4..d4ade0eb7 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -924,14 +924,14 @@ Function100597: ; 100597 ; 1005b2 MenuDataHeader_1005b2: ; 1005b2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 dw MenuData2_1005ba db 1 ; default option MenuData2_1005ba: - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "はい@" db "いいえ@" @@ -975,14 +975,14 @@ Function1005e1: ; 1005e1 ; 1005fc MenuDataHeader_1005fc: ; 1005fc - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 dw MenuData2_100604 db 1 ; default option MenuData2_100604: ; 100604 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "かける@" db "まつ@" @@ -2126,7 +2126,7 @@ Function100d67: ; 100d67 db 1 ; default option .MenuData2: ; 100d90 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "いれかえる@" ; TRADE db "つよさをみる@" ; STATS @@ -6287,7 +6287,7 @@ Function1029af: ; 1029af ; 1029bb MenuDataHeader_1029bb: ; 1029bb - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 3 ; start coords db 12, 15 ; end coords dw NULL @@ -7785,14 +7785,14 @@ AskMobileOrCable: ; 103612 ; 103640 MenuDataHeader_103640: ; 103640 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 13 ; start coords db 11, 19 ; end coords dw MenuData2_103648 db 1 ; default option MenuData2_103648: ; 103648 - db $80 ; flags + db STATICMENU_CURSOR ; flags db 2 db "モバイル@" db "ケーブル@" @@ -7940,14 +7940,14 @@ Function103700: ; 103700 ; 103747 MenuDataHeader_103747: ; 103747 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 5, 13 ; start coords db 11, 19 ; end coords dw MenuData2_10374f db 1 ; default option MenuData2_10374f: ; 10374f - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "はい@" db "やめる@" diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 5fc5eaa7e..811a27592 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7297,7 +7297,7 @@ Function1179a7: ; 1179a7 (45:79a7) ; 1179b5 (45:79b5) MenuDataHeader_1179b5: ; 1179b5 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL @@ -7305,7 +7305,7 @@ MenuDataHeader_1179b5: ; 1179b5 ; 1179bd MenuDataHeader_1179bd: ; 1179bd - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL @@ -7658,14 +7658,14 @@ Function117c89: ret MenuDataHeader_117cbc: ; 0x117cbc - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL ; menu data 2 db 0 ; default option MenuDataHeader_117cc4: ; 0x117cc4 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL ; menu data 2 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index b114e5166..4ddc2b13a 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -507,7 +507,7 @@ Function1161d5: ; 1161d5 ; 11628c MenuDataHeader_11628c: ; 11628c - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 0 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 10a97e426..31eda9b6a 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3955,7 +3955,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ; 119cf7 MenuDataHeader_119cf7: ; 119cf7 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 12 ; start coords db 11, 19 ; end coords dw NULL @@ -3963,7 +3963,7 @@ MenuDataHeader_119cf7: ; 119cf7 ; 119cff MenuData_119cff: ; 119cff - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 15 ; start coords db 11, 19 ; end coords dw NULL @@ -4757,7 +4757,7 @@ String_11a2d3: ; 11a2d3 ; 11a2d6 MenuDataHeader_11a2d6: ; 11a2d6 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 ; start coords db 10, 19 ; end coords dw NULL @@ -4765,7 +4765,7 @@ MenuDataHeader_11a2d6: ; 11a2d6 ; 11a2de MenuDataHeader_11a2de: ; 11a2de - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL @@ -5329,7 +5329,7 @@ String_11a7f4: ; 11a7f4 ; 11a804 MenuDataHeader_11a804: ; 11a804 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 5, 19 ; end coords dw NULL @@ -6001,7 +6001,7 @@ Function11adc4: ; 11ae38 MenuDataHeader_11ae38: ; 11ae38 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 10 ; start coords db 17, 17 ; end coords dw NULL @@ -6248,7 +6248,7 @@ Function11afd6: ; 11afd6 ; 11afe8 MenuDataHeader_11afe8: ; 11afe8 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 9 ; start coords db 17, 19 ; end coords dw NULL @@ -6266,7 +6266,7 @@ String_11b003: ; 11b003 ; 11b013 MenuDataHeader_11b013: ; 11b013 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 0e2f7d024..b9b368e1f 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -672,7 +672,7 @@ Function171c66: ; 171c66 (5c:5c66) ; 171c6b (5c:5c6b) MenuDataHeader_171c6b: ; 171c6b - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 5731f01fc..a4861be28 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -483,14 +483,14 @@ Function17d246: ; 17d246 ; 17d26a MenuDataHeader_17d26a: ; 17d26a - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 9, 14 ; end coords dw MenuData2_17d272 db 1 ; default option MenuData2_17d272: ; 17d272 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 db "ニュース¯よみこむ@" db "ニュース¯みる@" @@ -499,14 +499,14 @@ MenuData2_17d272: ; 17d272 ; 17d28f MenuDataHeader_ChallengeExplanationCancel: ; 17d28f - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 7, 14 ; end coords dw MenuData2_ChallengeExplanationCancel db 1 ; default option MenuData2_ChallengeExplanationCancel: ; 17d297 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 db "Challenge@" db "Explanation@" @@ -1943,7 +1943,7 @@ Function17dc1f: ; 17dc1f ; 17dc96 MenuData2_17dc96: - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" db "いいえ@" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index e36e779ae..513b0bf82 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -461,7 +461,7 @@ Function4a28a: ; 4a28a (12:628a) ; 4a346 (12:6346) MenuDataHeader_0x4a346: ; 0x4a346 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 12 ; start coords db 06, 19 ; end coords @@ -484,7 +484,7 @@ UnknownText_0x4a35d: ; 0x4a35d ; 0x4a362 DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 07, 14 ; start coords db 11, 19 ; end coords dw MenuData2_0x4a36a @@ -492,7 +492,7 @@ DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 ; 0x4a36a MenuData2_0x4a36a: ; 0x4a36a - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 ; items db "はい@" db "いいえ@" |