pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)

Browse Source 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:43:51 -05:00
parent dfcca93b45 d38ed29a46
commit 14c8cf5b48
51 changed files with 571 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/mobile_12.asm
View File

@@ -563,14 +563,14 @@ MobileDesc_ZipCode: db "Your zip code?@"
; 484f1
MenuDataHeader_0x484f1: ; 0x484f1
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 2, SCREEN_WIDTH - 1, 7
dw MenuData2_0x484f9
db 1 ; default option
; 0x484f9
MenuData2_0x484f9: ; 0x484f9
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 2 ; items
Strings_484fb:
String_484fb: db "Boy@"
@@ -578,26 +578,26 @@ String_484ff: db "Girl@"
; 0x48504
MenuDataHeader_0x48504: ; 0x48504
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
MenuDataHeader_0x48509: ; 0x48509
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, SCREEN_WIDTH - 1, 7
MenuDataHeader_0x4850e: ; 0x4850e
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
MenuDataHeader_0x48513: ; 0x48513
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 1, 18, 12
dw MenuData2_0x4851b
db 1 ; default option
; 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
@@ -723,7 +723,7 @@ Function486bf: ; 486bf (12:46bf)
.got_num_rows_2
ld a, 1
ld [hli], a ; num cols
ld [hl], $0 ; flags 1
ld [hl], 0 ; flags 1
set 5, [hl]
inc hl
xor a
@@ -789,7 +789,7 @@ Function4873c: ; 4873c (12:473c)
ld [hli], a ; num rows
ld a, 1
ld [hli], a ; num cols
ld [hl], $0 ; flags 1
ld [hl], 0 ; flags 1
set 5, [hl]
inc hl
xor a
@@ -1272,7 +1272,7 @@ Function48a9a: ; 48a9a (12:4a9a)
; 48a9c (12:4a9c)
MenuDataHeader_0x48a9c: ; 0x48a9c
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 8, SCREEN_WIDTH - 1, 13
String_48aa1: ; 48aa1

2
mobile/mobile_12_2.asm
View File

@@ -715,7 +715,7 @@ Function4ac58: ; 4ac58
; 4aca2
MenuDataHeader_0x4aca2: ; 0x4aca2
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 1 ; default option

26
mobile/mobile_22.asm
View File

@@ -277,14 +277,14 @@ Function89261: ; 89261
; 892a3
MenuDataHeader_0x892a3: ; 0x892a3
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, 15, 9
dw MenuData2_0x892ab
db 1 ; default option
; 0x892ab
MenuData2_0x892ab: ; 0x892ab
db $c0 ; flags
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "はい@"
db "いいえ@"
@@ -2831,7 +2831,7 @@ Function8a116: ; 8a116 (22:6116)
; 8a176 (22:6176)
MenuDataHeader_0x8a176: ; 0x8a176
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
; 8a17b
@@ -2853,14 +2853,14 @@ Function8a17b: ; 8a17b (22:617b)
; 8a19a (22:619a)
MenuDataHeader_0x8a19a: ; 0x8a19a
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
dw MenuData2_0x8a1a2
db 1 ; default option
; 0x8a1a2
MenuData2_0x8a1a2: ; 0x8a1a2
db $e0 ; flags
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 3 ; items
db "ひらく@"
db "すてる@"
@@ -3012,7 +3012,7 @@ Function8a2aa: ; 8a2aa (22:62aa)
; 8a2ef (22:62ef)
MenuDataHeader_0x8a2ef: ; 0x8a2ef
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
; 8a2f4
@@ -3173,14 +3173,14 @@ Unknown_8a408: db 1, 2, -1
Unknown_8a40b: db 1, 2, 3, -1
MenuDataHeader_0x8a40f: ; 0x8a40f
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, TEXTBOX_Y - 1
dw MenuData2_0x8a417
db 1 ; default option
; 0x8a417
MenuData2_0x8a417: ; 0x8a417
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 4 ; items
db "めいしりスト@"
db "じぶんの めいし@"
@@ -3189,14 +3189,14 @@ MenuData2_0x8a417: ; 0x8a417
; 0x8a435
MenuDataHeader_0x8a435: ; 0x8a435
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, 9
dw MenuData2_0x8a43d
db 1 ; default option
; 0x8a43d
MenuData2_0x8a43d: ; 0x8a43d
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "めいしりスト@"
db "じぶんの めいし@"
@@ -3914,7 +3914,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5)
; 8a9c9 (22:69c9)
MenuDataHeader_0x8a9c9: ; 0x8a9c9
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
; 8a9ce
@@ -3943,14 +3943,14 @@ Function8a9ce: ; 8a9ce (22:69ce)
; 8a9f2 (22:69f2)
MenuDataHeader_0x8a9f2: ; 0x8a9f2
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
dw MenuData2_0x8a9fa
db 1 ; default option
; 0x8a9fa
MenuData2_0x8a9fa: ; 0x8a9fa
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@"
db "みる@"

14
mobile/mobile_22_2.asm
View File

@@ -910,7 +910,7 @@ Function8b855: ; 8b855
; 8b867
MenuDataHeader_0x8b867: ; 0x8b867
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 1, 3, 18, 13
dw MenuData2_0x8b870
db 1 ; default option
@@ -919,7 +919,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
@@ -1082,18 +1082,18 @@ Function8b9ab: ; 8b9ab
; 8b9ac
MenuDataHeader_0x8b9ac: ; 0x8b9ac
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
MenuDataHeader_0x8b9b1: ; 0x8b9b1
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 7
dw MenuData2_0x8b9b9
db 1 ; default option
; 0x8b9b9
MenuData2_0x8b9b9: ; 0x8b9b9
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@" ; EDIT
db "いれかえ@" ; REPLACE
@@ -1101,14 +1101,14 @@ MenuData2_0x8b9b9: ; 0x8b9b9
; 0x8b9ca
MenuDataHeader_0x8b9ca: ; 0x8b9ca
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_0x8b9d2
db 1 ; default option
; 0x8b9d2
MenuData2_0x8b9d2: ; 0x8b9d2
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 5 ; items
db "みる@" ; VIEW
db "へんしゅう@" ; EDIT

20
mobile/mobile_40.asm
View File

@@ -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 "まつ@"
@@ -2125,7 +2125,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
@@ -6286,7 +6286,7 @@ Function1029af: ; 1029af
; 1029bb
MenuDataHeader_1029bb: ; 1029bb
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 3, 10, 15, 12
dw NULL
db 1 ; default option
@@ -7783,13 +7783,13 @@ Special_AskMobileOrCable: ; 103612
; 103640
MenuDataHeader_103640: ; 103640
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_103648
db 1 ; default option
MenuData2_103648: ; 103648
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 2
db "モバイル@"
db "ケーブル@"
@@ -7937,13 +7937,13 @@ Function103700: ; 103700
; 103747
MenuDataHeader_103747: ; 103747
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
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 "やめる@"

8
mobile/mobile_45.asm
View File

@@ -7298,14 +7298,14 @@ Function1179a7: ; 1179a7 (45:79a7)
; 1179b5 (45:79b5)
MenuDataHeader_1179b5: ; 1179b5
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
; 1179bd
MenuDataHeader_1179bd: ; 1179bd
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
@@ -7657,13 +7657,13 @@ Function117c89:
ret
MenuDataHeader_117cbc: ; 0x117cbc
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
MenuDataHeader_117cc4: ; 0x117cc4
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default item

2
mobile/mobile_45_sprite_engine.asm
View File

@@ -507,7 +507,7 @@ Function1161d5: ; 1161d5
; 11628c
MenuDataHeader_11628c: ; 11628c
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option

16
mobile/mobile_46.asm
View File

@@ -3954,14 +3954,14 @@ BattleTowerRoomMenu_UpdateYesNoMenu:
; 119cf7
MenuDataHeader_119cf7: ; 119cf7
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
; 119cff
MenuData_119cff: ; 119cff
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 15, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
@@ -4754,14 +4754,14 @@ String_11a2d3: ; 11a2d3
; 11a2d6
MenuDataHeader_11a2d6: ; 11a2d6
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 6, SCREEN_WIDTH - 1, 10
dw NULL
db 0 ; default option
; 11a2de
MenuDataHeader_11a2de: ; 11a2de
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 0 ; default option
@@ -5324,7 +5324,7 @@ String_11a7f4: ; 11a7f4
; 11a804
MenuDataHeader_11a804: ; 11a804
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, 5
dw NULL
db 0 ; default option
@@ -5995,7 +5995,7 @@ Function11adc4:
; 11ae38
MenuDataHeader_11ae38: ; 11ae38
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 10, 10, 17, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
@@ -6241,7 +6241,7 @@ Function11afd6: ; 11afd6
; 11afe8
MenuDataHeader_11afe8: ; 11afe8
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
@@ -6258,7 +6258,7 @@ String_11b003: ; 11b003
; 11b013
MenuDataHeader_11b013: ; 11b013
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
db 1 ; default option

2
mobile/mobile_5c.asm
View File

@@ -672,7 +672,7 @@ Function171c66: ; 171c66 (5c:5c66)
; 171c6b (5c:5c6b)
MenuDataHeader_171c6b: ; 171c6b
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option

10
mobile/mobile_5f.asm
View File

@@ -483,13 +483,13 @@ Function17d246: ; 17d246
; 17d26a
MenuDataHeader_17d26a: ; 17d26a
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 14, 9
dw MenuData2_17d272
db 1 ; default option
MenuData2_17d272: ; 17d272
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 4
db "ニュース¯よみこむ@"
db "ニュース¯みる@"
@@ -498,13 +498,13 @@ MenuData2_17d272: ; 17d272
; 17d28f
MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 14, 7
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@"
@@ -1941,7 +1941,7 @@ Function17dc1f: ; 17dc1f
; 17dc96
MenuData2_17dc96:
db $e0 ; flags
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 2
db "はい@"
db "いいえ@"

6
mobile/mobile_menu.asm
View File

@@ -461,7 +461,7 @@ Function4a28a: ; 4a28a (12:628a)
; 4a346 (12:6346)
MenuDataHeader_0x4a346: ; 0x4a346
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 12, 0, SCREEN_WIDTH - 1, 6
String_4a34b: ; 4a34b
@@ -483,14 +483,14 @@ UnknownText_0x4a35d: ; 0x4a35d
; 0x4a362
DeletePassword_YesNo_MenuDataHeader: ; 0x4a362
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw MenuData2_0x4a36a
db 2 ; default option
; 0x4a36a
MenuData2_0x4a36a: ; 0x4a36a
db $e0 ; flags
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 2 ; items
db "はい@"
db "いいえ@"