summaryrefslogtreecommitdiff
path: root/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'mobile')
-rwxr-xr-xmobile/fixed_words.asm8
-rwxr-xr-xmobile/mobile_12.asm48
-rwxr-xr-xmobile/mobile_12_2.asm14
-rw-r--r--mobile/mobile_22.asm82
-rw-r--r--mobile/mobile_22_2.asm38
-rw-r--r--mobile/mobile_40.asm128
-rwxr-xr-xmobile/mobile_41.asm6
-rw-r--r--mobile/mobile_45.asm36
-rwxr-xr-xmobile/mobile_45_sprite_engine.asm2
-rwxr-xr-xmobile/mobile_46.asm72
-rwxr-xr-xmobile/mobile_5b.asm4
-rwxr-xr-xmobile/mobile_5c.asm6
-rw-r--r--mobile/mobile_5e.asm2
-rw-r--r--mobile/mobile_5f.asm36
-rwxr-xr-xmobile/mobile_menu.asm18
15 files changed, 249 insertions, 251 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index d2b20dff1..602639b82 100755
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -274,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156
jr .copy_string
; 11c1ab
-Special_Function11c1ab: ; 11c1ab
+Function11c1ab: ; 11c1ab
ld a, [hInMenu]
push af
ld a, $1
@@ -3037,7 +3037,7 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
ld [wcd34], a
ld hl, EZChat_SortedWords
- ld a, (EZChat_SortedWordsEnd - EZChat_SortedWords) / 4
+ ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4
.MasterLoop: ; 11d3ef
push af
@@ -4120,7 +4120,7 @@ macro_11f220: MACRO
; 12 words per page (0-based indexing)
x = \1 / 12
if \1 % 12 == 0
-x = x +- 1
+x = x + -1
endc
db x
ENDM
@@ -4196,4 +4196,4 @@ x = $d012
macro_11f23c $15 ; wa
x = $d000
macro_11f23c $09 ; end
-EZChat_SortedWordsEnd:
+.End
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index c7db74e70..c9f4f56e0 100755
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -284,8 +284,8 @@ asm_4828d: ; 4828d (12:428d)
hlcoord 1, 16
ld de, MobileDesc_Gender
call PlaceString
- ld hl, MenuDataHeader_0x484f1
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x484f1
+ call LoadMenuHeader
call Function4873c
hlcoord 11, 2
ld b, $4
@@ -315,7 +315,7 @@ asm_4828d: ; 4828d (12:428d)
ld a, [hli]
cp $50
jr nz, .asm_482e1
- ld a, $1
+ ld a, 1 << PLAYERGENDER_FEMALE_F
ld [wPlayerGender], a
jr .asm_482f1
.asm_482ed
@@ -336,10 +336,10 @@ Function48304: ; 48304 (12:4304)
hlcoord 1, 16
ld de, MobileDesc_Address
call PlaceString
- ld hl, MenuDataHeader_0x48504
- call LoadMenuDataHeader
- ld hl, MenuDataHeader_0x48513
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x48504
+ call LoadMenuHeader
+ ld hl, MenuHeader_0x48513
+ call LoadMenuHeader
hlcoord 10, 0
ld b, $c
ld c, $8
@@ -562,14 +562,14 @@ MobileDesc_Address: db "Where do you live?@"
MobileDesc_ZipCode: db "Your zip code?@"
; 484f1
-MenuDataHeader_0x484f1: ; 0x484f1
+MenuHeader_0x484f1: ; 0x484f1
db MENU_BACKUP_TILES ; flags
menu_coords 11, 2, SCREEN_WIDTH - 1, 7
- dw MenuData2_0x484f9
+ dw MenuData_0x484f9
db 1 ; default option
; 0x484f9
-MenuData2_0x484f9: ; 0x484f9
+MenuData_0x484f9: ; 0x484f9
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 2 ; items
Strings_484fb:
@@ -577,26 +577,26 @@ String_484fb: db "Boy@"
String_484ff: db "Girl@"
; 0x48504
-MenuDataHeader_0x48504: ; 0x48504
+MenuHeader_0x48504: ; 0x48504
db MENU_BACKUP_TILES ; flags
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-MenuDataHeader_0x48509: ; 0x48509
+MenuHeader_0x48509: ; 0x48509
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, SCREEN_WIDTH - 1, 7
-MenuDataHeader_0x4850e: ; 0x4850e
+MenuHeader_0x4850e: ; 0x4850e
db MENU_BACKUP_TILES ; flags
menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-MenuDataHeader_0x48513: ; 0x48513
+MenuHeader_0x48513: ; 0x48513
db MENU_BACKUP_TILES ; flags
menu_coords 11, 1, 18, 12
- dw MenuData2_0x4851b
+ dw MenuData_0x4851b
db 1 ; default option
; 0x4851b
-MenuData2_0x4851b: ; 0x4851b
+MenuData_0x4851b: ; 0x4851b
db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags
db 6 ; items
@@ -800,7 +800,7 @@ Function4873c: ; 4873c (12:473c)
add B_BUTTON
ld [hli], a ; joypad filter
; ld a, [wPlayerGender]
- ; xor 1
+ ; xor 1 << PLAYERGENDER_FEMALE_F
; inc a
ld a, [wPlayerGender]
and a
@@ -825,8 +825,8 @@ Function4876f: ; 4876f (12:476f)
hlcoord 1, 16
ld de, MobileDesc_Age
call PlaceString
- ld hl, MenuDataHeader_0x48509
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x48509
+ call LoadMenuHeader
ld a, [hInMenu]
push af
ld a, $1
@@ -1028,8 +1028,8 @@ Function488d3: ; 488d3 (12:48d3)
call PlaceString
call Function48a3a
jp c, Function4840c
- ld hl, MenuDataHeader_0x4850e
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x4850e
+ call LoadMenuHeader
ld a, [hInMenu]
push af
ld a, $1
@@ -1225,8 +1225,8 @@ String_48a38: ; 48a38
; 48a3a
Function48a3a: ; 48a3a (12:4a3a)
- ld hl, MenuDataHeader_0x48a9c
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x48a9c
+ call LoadMenuHeader
call Function4873c
ld a, $a
ld [w2DMenuCursorInitY], a
@@ -1271,7 +1271,7 @@ Function48a9a: ; 48a9a (12:4a9a)
ret
; 48a9c (12:4a9c)
-MenuDataHeader_0x48a9c: ; 0x48a9c
+MenuHeader_0x48a9c: ; 0x48a9c
db MENU_BACKUP_TILES ; flags
menu_coords 10, 8, SCREEN_WIDTH - 1, 13
diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
index 66ed07bef..47eb2f3bf 100755
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -159,7 +159,7 @@ MobileCheckOwnMonAnywhere: ; 4a843
ret
; 4a927
-UnusedSpecial_FindItemInPCOrBag: ; 4a927
+UnusedFindItemInPCOrBag: ; 4a927
ld a, [wScriptVar]
ld [wCurItem], a
ld hl, wPCItems
@@ -684,8 +684,8 @@ Function4ac58: ; 4ac58
hlcoord 1, 15
call ClearBox
farcall FreezeMonIcons
- ld hl, MenuDataHeader_0x4aca2
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x4aca2
+ call LoadMenuHeader
ld hl, wd019
bit 1, [hl]
jr z, .asm_4ac89
@@ -714,7 +714,7 @@ Function4ac58: ; 4ac58
ret
; 4aca2
-MenuDataHeader_0x4aca2: ; 0x4aca2
+MenuHeader_0x4aca2: ; 0x4aca2
db MENU_BACKUP_TILES ; flags
menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
@@ -724,19 +724,19 @@ MenuDataHeader_0x4aca2: ; 0x4aca2
Function4acaa: ; 4acaa
.asm_4acaa
ld a, $a0
- ld [wMenuData2Flags], a
+ ld [wMenuDataFlags], a
ld a, [wd019]
bit 1, a
jr z, .asm_4acc2
ld a, $2
- ld [wMenuData2Items], a
+ ld [wMenuDataItems], a
ld a, $c
ld [wMenuBorderTopCoord], a
jr .asm_4accc
.asm_4acc2
ld a, $4
- ld [wMenuData2Items], a
+ ld [wMenuDataItems], a
ld a, $8
ld [wMenuBorderTopCoord], a
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index 8af7cc896..99963bceb 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -26,17 +26,17 @@ OpenSRAMBank4: ; 89160
Function89168: ; 89168 (22:5168)
ld hl, wGameTimerPause
- set 7, [hl]
+ set GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function8916e: ; 8916e (22:516e)
ld hl, wGameTimerPause
- res 7, [hl]
+ res GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function89174: ; 89174 (22:5174)
ld hl, wGameTimerPause
- bit 7, [hl]
+ bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function8917a: ; 8917a (22:517a)
@@ -238,8 +238,8 @@ Function8925e: ; 8925e
Function89261: ; 89261
push af
push bc
- ld hl, MenuDataHeader_0x892a3
- call CopyMenuDataHeader
+ ld hl, MenuHeader_0x892a3
+ call CopyMenuHeader
pop bc
ld hl, wMenuBorderTopCoord
ld a, c
@@ -276,14 +276,14 @@ Function89261: ; 89261
ret
; 892a3
-MenuDataHeader_0x892a3: ; 0x892a3
+MenuHeader_0x892a3: ; 0x892a3
db MENU_BACKUP_TILES ; flags
menu_coords 10, 5, 15, 9
- dw MenuData2_0x892ab
+ dw MenuData_0x892ab
db 1 ; default option
; 0x892ab
-MenuData2_0x892ab: ; 0x892ab
+MenuData_0x892ab: ; 0x892ab
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "はい@"
@@ -619,7 +619,7 @@ Function89481: ; 89481
Function89492: ; 89492 (22:5492)
ld d, 0
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
ret z
inc d
ret
@@ -1269,7 +1269,7 @@ Function897d5: ; 897d5
Function89807: ; 89807 (22:5807)
ld hl, MobileAdapterGFX + $20 tiles
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .asm_89814
ld hl, MobileAdapterGFX + $43 tiles
.asm_89814
@@ -2203,7 +2203,7 @@ Function89d0d: ; 89d0d (22:5d0d)
Function89d5e: ; 89d5e (22:5d5e)
push af
- call CopyMenuDataHeader
+ call CopyMenuHeader
pop af
ld [wMenuCursorBuffer], a
call Mobile22_SetBGMapMode0
@@ -2786,8 +2786,8 @@ UnknownText_0x8a111: ; 0x8a111
Function8a116: ; 8a116 (22:6116)
ld a, $1
ld [wd030], a
- ld hl, MenuDataHeader_0x8a176
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x8a176
+ call LoadMenuHeader
.asm_8a121
call Mobile22_SetBGMapMode0
call Function8a17b
@@ -2830,7 +2830,7 @@ Function8a116: ; 8a116 (22:6116)
ret
; 8a176 (22:6176)
-MenuDataHeader_0x8a176: ; 0x8a176
+MenuHeader_0x8a176: ; 0x8a176
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
; 8a17b
@@ -2840,7 +2840,7 @@ Function8a17b: ; 8a17b (22:617b)
ld b, $5
ld c, $4
call Function89b3b
- ld hl, MenuDataHeader_0x8a19a
+ ld hl, MenuHeader_0x8a19a
ld a, [wd030]
call Function89d5e
ld hl, Function8a1b0
@@ -2852,14 +2852,14 @@ Function8a17b: ; 8a17b (22:617b)
ret
; 8a19a (22:619a)
-MenuDataHeader_0x8a19a: ; 0x8a19a
+MenuHeader_0x8a19a: ; 0x8a19a
db MENU_BACKUP_TILES ; flags
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
- dw MenuData2_0x8a1a2
+ dw MenuData_0x8a1a2
db 1 ; default option
; 0x8a1a2
-MenuData2_0x8a1a2: ; 0x8a1a2
+MenuData_0x8a1a2: ; 0x8a1a2
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 3 ; items
db "ひらく@"
@@ -2935,7 +2935,7 @@ UnknownText_0x8a23c: ; 0x8a23c
; 0x8a241
Function8a241: ; 8a241 (22:6241)
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call Function891fe
call Function8a262
jr nc, .asm_8a254
@@ -2978,8 +2978,8 @@ Function8a262: ; 8a262 (22:6262)
ret
Function8a2aa: ; 8a2aa (22:62aa)
- ld hl, MenuDataHeader_0x8a2ef
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x8a2ef
+ call LoadMenuHeader
ld hl, UnknownText_0x8a2f4
call PrintText
ld a, $1
@@ -3011,7 +3011,7 @@ Function8a2aa: ; 8a2aa (22:62aa)
ret
; 8a2ef (22:62ef)
-MenuDataHeader_0x8a2ef: ; 0x8a2ef
+MenuHeader_0x8a2ef: ; 0x8a2ef
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
; 8a2f4
@@ -3131,16 +3131,16 @@ Function8a3b2: ; 8a3b2 (22:63b2)
ld b, $6
ld c, $9
call Function89b3b
- ld hl, MenuDataHeader_0x8a435
+ ld hl, MenuHeader_0x8a435
jr .asm_8a3db
.asm_8a3ce
decoord 0, 2
ld b, $8
ld c, $9
call Function89b3b
- ld hl, MenuDataHeader_0x8a40f
+ ld hl, MenuHeader_0x8a40f
.asm_8a3db
- call CopyMenuDataHeader
+ call CopyMenuHeader
ret
Function8a3df: ; 8a3df (22:63df)
@@ -3172,14 +3172,14 @@ Function8a400: ; 8a400 (22:6400)
Unknown_8a408: db 1, 2, -1
Unknown_8a40b: db 1, 2, 3, -1
-MenuDataHeader_0x8a40f: ; 0x8a40f
+MenuHeader_0x8a40f: ; 0x8a40f
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, TEXTBOX_Y - 1
- dw MenuData2_0x8a417
+ dw MenuData_0x8a417
db 1 ; default option
; 0x8a417
-MenuData2_0x8a417: ; 0x8a417
+MenuData_0x8a417: ; 0x8a417
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 4 ; items
db "めいしりスト@"
@@ -3188,14 +3188,14 @@ MenuData2_0x8a417: ; 0x8a417
db "やめる@"
; 0x8a435
-MenuDataHeader_0x8a435: ; 0x8a435
+MenuHeader_0x8a435: ; 0x8a435
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 10, 9
- dw MenuData2_0x8a43d
+ dw MenuData_0x8a43d
db 1 ; default option
; 0x8a43d
-MenuData2_0x8a43d: ; 0x8a43d
+MenuData_0x8a43d: ; 0x8a43d
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "めいしりスト@"
@@ -3462,7 +3462,7 @@ Palette_8a624: ; 8a624
; 8a62c
Function8a62c: ; 8a62c (22:662c)
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call Function891fe
xor a
call Function8b94a
@@ -3884,15 +3884,15 @@ Function8a930: ; 8a930 (22:6930)
ret
Function8a999: ; 8a999 (22:6999)
- ld hl, MenuDataHeader_0x8a9c9
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x8a9c9
+ call LoadMenuHeader
ld c, $1
.asm_8a9a1
call Function8a9ce
jr c, .asm_8a9bb
push bc
push de
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
pop de
dec e
ld a, e
@@ -3913,7 +3913,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5)
dw Function8ab3b
; 8a9c9 (22:69c9)
-MenuDataHeader_0x8a9c9: ; 0x8a9c9
+MenuHeader_0x8a9c9: ; 0x8a9c9
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
; 8a9ce
@@ -3926,7 +3926,7 @@ Function8a9ce: ; 8a9ce (22:69ce)
call Function89b3b
pop bc
ld a, c
- ld hl, MenuDataHeader_0x8a9f2
+ ld hl, MenuHeader_0x8a9f2
call Function89d5e
ld hl, Function8aa09
call Function89d85
@@ -3942,14 +3942,14 @@ Function8a9ce: ; 8a9ce (22:69ce)
ret
; 8a9f2 (22:69f2)
-MenuDataHeader_0x8a9f2: ; 0x8a9f2
+MenuHeader_0x8a9f2: ; 0x8a9f2
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, 18, TEXTBOX_Y - 1
- dw MenuData2_0x8a9fa
+ dw MenuData_0x8a9fa
db 1 ; default option
; 0x8a9fa
-MenuData2_0x8a9fa: ; 0x8a9fa
+MenuData_0x8a9fa: ; 0x8a9fa
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@"
@@ -4148,7 +4148,7 @@ Function8ab3b: ; 8ab3b (22:6b3b)
Function8ab93: ; 8ab93 (22:6b93)
call ClearBGPalettes
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
farcall Function105688
call ClearSprites
call Function891fe
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index a55daafc9..974836b88 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -2,7 +2,7 @@ Function8b342:: ; 8b342
; Loads the map data pointer, then runs through a
; dw with three dummy functions. Spends a lot of energy
; doing pretty much nothing.
- call GetMapDataPointer
+ call GetMapAttributesPointer
ld d, h
ld e, l
@@ -808,8 +808,8 @@ Function8b79e: ; 8b79e
Function8b7bd: ; 8b7bd
call Function8b855
- ld hl, MenuDataHeader_0x8b867
- call CopyMenuDataHeader
+ ld hl, MenuHeader_0x8b867
+ call CopyMenuHeader
ld a, [wd030]
ld [wMenuCursorBuffer], a
ld a, [wd031]
@@ -871,7 +871,7 @@ Function8b7bd: ; 8b7bd
Function8b832: ; 8b832
ld a, [wMenuScrollPosition]
- ld hl, wMenuData2Items
+ ld hl, wMenuDataItems
sub [hl]
jr nc, Function8b84b
xor a
@@ -880,7 +880,7 @@ Function8b832: ; 8b832
Function8b83e: ; 8b83e
ld a, [wMenuScrollPosition]
- ld hl, wMenuData2Items
+ ld hl, wMenuDataItems
add [hl]
cp $24
jr c, Function8b84b
@@ -909,16 +909,16 @@ Function8b855: ; 8b855
ret
; 8b867
-MenuDataHeader_0x8b867: ; 0x8b867
+MenuHeader_0x8b867: ; 0x8b867
db MENU_BACKUP_TILES ; flags
menu_coords 1, 3, 18, 13
- dw MenuData2_0x8b870
+ dw MenuData_0x8b870
db 1 ; default option
; 0x8b86f
db 0
-MenuData2_0x8b870: ; 0x8b870
+MenuData_0x8b870: ; 0x8b870
db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags
db 5 ; items
db 3, 1
@@ -1035,22 +1035,22 @@ Function8b94a: ; 8b94a
Function8b960: ; 8b960 (22:7960)
- ld hl, MenuDataHeader_0x8b9ac
- call LoadMenuDataHeader
+ ld hl, MenuHeader_0x8b9ac
+ call LoadMenuHeader
call Function8b9e9
jr c, .asm_8b97a
hlcoord 11, 0
ld b, $6
ld c, $7
call Function8b703
- ld hl, MenuDataHeader_0x8b9b1
+ ld hl, MenuHeader_0x8b9b1
jr .asm_8b987
.asm_8b97a
hlcoord 11, 0
ld b, $a
ld c, $7
call Function8b703
- ld hl, MenuDataHeader_0x8b9ca
+ ld hl, MenuHeader_0x8b9ca
.asm_8b987
ld a, $1
call Function89d5e
@@ -1081,18 +1081,18 @@ Function8b9ab: ; 8b9ab
ret
; 8b9ac
-MenuDataHeader_0x8b9ac: ; 0x8b9ac
+MenuHeader_0x8b9ac: ; 0x8b9ac
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-MenuDataHeader_0x8b9b1: ; 0x8b9b1
+MenuHeader_0x8b9b1: ; 0x8b9b1
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 7
- dw MenuData2_0x8b9b9
+ dw MenuData_0x8b9b9
db 1 ; default option
; 0x8b9b9
-MenuData2_0x8b9b9: ; 0x8b9b9
+MenuData_0x8b9b9: ; 0x8b9b9
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3 ; items
db "へんしゅう@" ; EDIT
@@ -1100,14 +1100,14 @@ MenuData2_0x8b9b9: ; 0x8b9b9
db "やめる@" ; QUIT
; 0x8b9ca
-MenuDataHeader_0x8b9ca: ; 0x8b9ca
+MenuHeader_0x8b9ca: ; 0x8b9ca
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
- dw MenuData2_0x8b9d2
+ dw MenuData_0x8b9d2
db 1 ; default option
; 0x8b9d2
-MenuData2_0x8b9d2: ; 0x8b9d2
+MenuData_0x8b9d2: ; 0x8b9d2
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 5 ; items
db "みる@" ; VIEW
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index b96e6c470..dbb682b56 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -318,7 +318,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
- farcall Special_FadeOutPalettes
+ farcall FadeOutPalettes
farcall Function106464
call HideSprites
call DelayFrame
@@ -898,8 +898,8 @@ Jumptable_100581: ; 100581
; 100585
Function100585: ; 100585
- ld hl, MenuDataHeader_1005b2
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1005b2
+ call LoadMenuHeader
ld a, 0
ld [wcd28], a
ld a, [wcd26]
@@ -923,14 +923,14 @@ Function100597: ; 100597
ret
; 1005b2
-MenuDataHeader_1005b2: ; 1005b2
+MenuHeader_1005b2: ; 1005b2
db MENU_BACKUP_TILES ; flags
db 6, 14
db 10, 19
- dw MenuData2_1005ba
+ dw MenuData_1005ba
db 1 ; default option
-MenuData2_1005ba:
+MenuData_1005ba:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2
db "はい@"
@@ -950,8 +950,8 @@ Jumptable_1005cb: ; 1005cb
; 1005cf
Function1005cf: ; 1005cf
- ld hl, MenuDataHeader_1005fc
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1005fc
+ call LoadMenuHeader
ld a, 0
ld [wcd28], a
ld a, [wcd26]
@@ -974,14 +974,14 @@ Function1005e1: ; 1005e1
ret
; 1005fc
-MenuDataHeader_1005fc: ; 1005fc
+MenuHeader_1005fc: ; 1005fc
db MENU_BACKUP_TILES ; flags
db 6, 14
db 10, 19
- dw MenuData2_100604
+ dw MenuData_100604
db 1 ; default option
-MenuData2_100604: ; 100604
+MenuData_100604: ; 100604
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2
db "かける@"
@@ -1800,12 +1800,12 @@ SECTION "bank40_2", ROMX
Function100b12: ; 100b12
call Function100dd8
ret c
- ld hl, BattleMenuDataHeader
- ld a, BANK(BattleMenuDataHeader)
- ld de, LoadMenuDataHeader
+ ld hl, BattleMenuHeader
+ ld a, BANK(BattleMenuHeader)
+ ld de, LoadMenuHeader
call FarCall_de
- ld a, BANK(BattleMenuDataHeader)
- ld [wMenuData2_2DMenuItemStringsBank], a
+ ld a, BANK(BattleMenuHeader)
+ ld [wMenuData_2DMenuItemStringsBank], a
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call Function100e72
@@ -1845,8 +1845,8 @@ Function100b45: ; 100b45
; 100b7a
Function100b7a: ; 100b7a
- ld hl, CopyMenuData2
- ld a, [wMenuData2_2DMenuItemStringsBank]
+ ld hl, CopyMenuData
+ ld a, [wMenuData_2DMenuItemStringsBank]
rst FarCall
farcall Draw2DMenu
farcall MobileTextBorder
@@ -2103,28 +2103,28 @@ MobileBattleMonMenu: ; 100d22
; 100d67
Function100d67: ; 100d67
- ld hl, .MenuDataHeader
- call CopyMenuDataHeader
+ ld hl, .MenuHeader
+ call CopyMenuHeader
xor a
ld [hBGMapMode], a
call MenuBox
call UpdateSprites
call PlaceVerticalMenuItems
call WaitBGMap
- call CopyMenuData2
+ call CopyMenuData
call InitVerticalMenuCursor
ld hl, w2DMenuFlags1
set 6, [hl]
ret
; 100d88
-.MenuDataHeader: ; 100d88
+.MenuHeader: ; 100d88
db 0 ; flags
menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw .MenuData2
+ dw .MenuData
db 1 ; default option
-.MenuData2: ; 100d90
+.MenuData: ; 100d90
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3
db "いれかえる@" ; TRADE
@@ -2803,7 +2803,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2
ret
; 1011f1
-Special_Function1011f1: ; 1011f1
+Function1011f1: ; 1011f1
ld a, $04
call GetSRAMBank
ld a, [$a60c]
@@ -2812,7 +2812,7 @@ Special_Function1011f1: ; 1011f1
ld hl, wdc41
res 4, [hl]
ld hl, wGameTimerPause
- bit 7, [hl]
+ bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
jr z, .skip
ld hl, wdc41
set 4, [hl]
@@ -2827,20 +2827,20 @@ Special_Function1011f1: ; 1011f1
ret
; 101220
-Special_Function101220: ; 101220
+Function101220: ; 101220
xor a
ld [wLinkMode], a
ret
; 101225
-Special_Function101225: ; 101225
+Function101225: ; 101225
ld d, 1
ld e, BANK(Jumptable_101297)
ld bc, Jumptable_101297
call Function100000
jr Function10123d
-Special_Function101231: ; 101231
+Function101231: ; 101231
ld d, 2
ld e, BANK(Jumptable_101297)
ld bc, Jumptable_101297
@@ -2871,7 +2871,7 @@ Function101251: ; 101251
call Function1021e0
call Function1020ea
ret c
- call Special_Function102142
+ call Function102142
ret
; 101265
@@ -4535,7 +4535,7 @@ Unknown_101d8d: ; 101d8d
Function101d95: ; 101d95
call Function101ee2
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
ld e, $0e
call Function101ee4
ld hl, wcd29
@@ -4703,7 +4703,7 @@ Function101e98: ; 101e98
farcall Function8adb3
ret c
ld hl, wGameTimerPause
- set 7, [hl]
+ set GAMETIMERPAUSE_MOBILE_7_F, [hl]
ld hl, wdc41
set 4, [hl]
ret
@@ -4711,7 +4711,7 @@ Function101e98: ; 101e98
Function101ead: ; 101ead
ld hl, wGameTimerPause
- bit 7, [hl]
+ bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
jr nz, .asm_101ec8
ld hl, wdc41
bit 2, [hl]
@@ -5024,7 +5024,7 @@ Function102112: ; 102112
ret
; 102142
-Special_Function102142: ; 102142
+Function102142: ; 102142
call Function10218d
call Function102180
ld hl, UnknownText_0x1021d1
@@ -6200,8 +6200,8 @@ Jumptable_10292f: ; 10292f
; 102933
Function102933: ; 102933
- ld hl, MenuDataHeader_1029bb
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1029bb
+ call LoadMenuHeader
call Function102e07
ld a, $32
ld [wTextDelayFrames], a
@@ -6285,7 +6285,7 @@ Function1029af: ; 1029af
ret
; 1029bb
-MenuDataHeader_1029bb: ; 1029bb
+MenuHeader_1029bb: ; 1029bb
db MENU_BACKUP_TILES ; flags
menu_coords 3, 10, 15, 12
dw NULL
@@ -6305,7 +6305,7 @@ Jumptable_1029cb: ; 1029cb
; 1029cf
Function1029cf: ; 1029cf
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
hlcoord 10, 7
ld b, 3
ld c, 8
@@ -7722,9 +7722,9 @@ Unknown_1035d7: ; 1035d7
dw Unknown_103608
dw Unknown_103608
dw Unknown_1035fe
- dw Special_AskMobileOrCable
- dw Special_AskMobileOrCable
- dw Special_AskMobileOrCable
+ dw AskMobileOrCable
+ dw AskMobileOrCable
+ dw AskMobileOrCable
Unknown_1035e7: ; 1035e7
dwcoord 0, 6
@@ -7755,9 +7755,9 @@ Unknown_103608: ; 103608
db 2, 2, 3
; 103612
-Special_AskMobileOrCable: ; 103612
- ld hl, MenuDataHeader_103640
- call LoadMenuDataHeader
+AskMobileOrCable: ; 103612
+ ld hl, MenuHeader_103640
+ call LoadMenuHeader
ld a, [wMobileOrCable_LastSelection]
and $0f
jr z, .skip_load
@@ -7782,13 +7782,13 @@ Special_AskMobileOrCable: ; 103612
ret
; 103640
-MenuDataHeader_103640: ; 103640
+MenuHeader_103640: ; 103640
db MENU_BACKUP_TILES ; flags
menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
- dw MenuData2_103648
+ dw MenuData_103648
db 1 ; default option
-MenuData2_103648: ; 103648
+MenuData_103648: ; 103648
db STATICMENU_CURSOR ; flags
db 2
db "モバイル@"
@@ -7811,7 +7811,7 @@ Function103654: ; 103654
ret
; 10366e
-Special_Mobile_SelectThreeMons: ; 10366e
+Mobile_SelectThreeMons: ; 10366e
farcall Mobile_AlwaysReturnNotCarry
bit 7, c
jr z, .asm_10369b
@@ -7849,8 +7849,8 @@ Special_Mobile_SelectThreeMons: ; 10366e
.asm_1036b5
call Function103700
jr c, .asm_1036f4
- ld hl, MenuDataHeader_103747
- call LoadMenuDataHeader
+ ld hl, MenuHeader_103747
+ call LoadMenuHeader
call VerticalMenu
call ExitMenu
jr c, .asm_1036f4
@@ -7894,7 +7894,7 @@ Function1036f9: ; 1036f9
Function103700: ; 103700
ld c, $0a
ld hl, wSwarmFlags
- bit 4, [hl]
+ bit SWARMFLAGS_MOBILE_4_F, [hl]
jr z, .asm_10370f
farcall Function1008a6
@@ -7936,13 +7936,13 @@ Function103700: ; 103700
ret
; 103747
-MenuDataHeader_103747: ; 103747
+MenuHeader_103747: ; 103747
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
- dw MenuData2_10374f
+ dw MenuData_10374f
db 1 ; default option
-MenuData2_10374f: ; 10374f
+MenuData_10374f: ; 10374f
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3
db "はい@"
@@ -7979,7 +7979,7 @@ UnknownText_0x10377b: ; 0x10377b
db "@"
; 0x103780
-Special_Function103780: ; 103780
+Function103780: ; 103780
ld a, [wd265]
push af
call Function10378c
@@ -7991,18 +7991,18 @@ Special_Function103780: ; 103780
Function10378c: ; 10378c
ld c, 0
ld hl, wSwarmFlags
- bit 4, [hl]
+ bit SWARMFLAGS_MOBILE_4_F, [hl]
jr nz, .already_set
- ld c, $01
+ ld c, 1
ld hl, wSwarmFlags
- set 4, [hl]
+ set SWARMFLAGS_MOBILE_4_F, [hl]
.already_set
push bc
farcall Link_SaveGame
pop bc
jr c, .failed_to_save
- ld a, $01
+ ld a, 1
ld [wScriptVar], a
ld a, c
and a
@@ -8017,11 +8017,11 @@ Function10378c: ; 10378c
and a
ret z
ld hl, wSwarmFlags
- res 4, [hl]
+ res SWARMFLAGS_MOBILE_4_F, [hl]
ret
; 1037c2
-Special_Function1037c2: ; 1037c2
+Function1037c2: ; 1037c2
call Function103823
jr c, .nope
ld a, [wdc5f]
@@ -8047,7 +8047,7 @@ UnknownText_0x1037e6: ; 0x1037e6
db "@"
; 0x1037eb
-Special_Function1037eb: ; 1037eb
+Function1037eb: ; 1037eb
call Function103823
jr nc, .asm_103807
ld hl, UnknownText_0x103819
@@ -8102,7 +8102,7 @@ Function103823: ; 103823
ret
; 10383c
-Special_Function10383c: ; 10383c
+Function10383c: ; 10383c
ld a, $01
ld [wdc60], a
xor a
@@ -8135,7 +8135,7 @@ UnknownText_0x103876: ; 0x103876
db "@"
; 0x10387b
-Special_Function10387b: ; 10387b
+Function10387b: ; 10387b
farcall Mobile_AlwaysReturnNotCarry
bit 7, c
ret nz
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index e66618ef4..93c5a6f88 100755
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -324,7 +324,7 @@ StubbedTrainerRankings_FruitPicked: ; 10609b
ld hl, sTrainerRankingFruitPicked
jp StubbedTrainerRankings_Increment3Byte
-Special_StubbedTrainerRankings_Healings: ; 1060a2
+StubbedTrainerRankings_Healings: ; 1060a2
ret
ld hl, sTrainerRankingHealings
jp StubbedTrainerRankings_Increment3Byte
@@ -812,7 +812,7 @@ endr
; functions related to the cable club and various NPC scripts referencing communications
-Special_Mobile_DummyReturnFalse: ; 10630f
+Mobile_DummyReturnFalse: ; 10630f
xor a
ld [wScriptVar], a
ret
@@ -838,7 +838,7 @@ Mobile_AlwaysReturnNotCarry: ; 10632f
or a
ret
-Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J
+Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J
; check ~[4:b000] == [7:a800]
ld a, $4
call GetSRAMBank
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index a5d4ebf35..6bcced09e 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -6837,8 +6837,8 @@ Unknown_117356: ; 117356
SECTION "Mobile Stadium", ROMX
-Special_GiveOddEgg: ; 117656
- farcall GiveOddEgg
+GiveOddEgg: ; 117656
+ farcall _GiveOddEgg
ret
; 11765d
@@ -7168,12 +7168,12 @@ Function117764_a_button: ; 11784c (45:784c)
jp Function117764_start
Function1178aa: ; 1178aa (45:78aa)
- ld hl, MenuDataHeader_1179b5
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1179b5
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
- ld hl, MenuDataHeader_1179bd
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1179bd
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
farcall ReloadMapPart
@@ -7274,8 +7274,8 @@ asm_11797e: ; 11797e (45:797e)
ret
Function117984: ; 117984 (45:7984)
- ld hl, MenuDataHeader_1179b5
- call LoadMenuDataHeader
+ ld hl, MenuHeader_1179b5
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
farcall ReloadMapPart
@@ -7297,14 +7297,14 @@ Function1179a7: ; 1179a7 (45:79a7)
; 1179b5 (45:79b5)
-MenuDataHeader_1179b5: ; 1179b5
+MenuHeader_1179b5: ; 1179b5
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
+MenuHeader_1179bd: ; 1179bd
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
@@ -7438,8 +7438,8 @@ Function117b14:
ld hl, wcf64
dec [hl]
ret nz
- ld hl, MenuDataHeader_117cbc
- call LoadMenuDataHeader
+ ld hl, MenuHeader_117cbc
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
jp MobileStudium_JumptableIncrement
@@ -7450,8 +7450,8 @@ Function117b28:
jp MobileStudium_JumptableIncrement
Function117b31:
- ld hl, MenuDataHeader_117cc4
- call LoadMenuDataHeader
+ ld hl, MenuHeader_117cc4
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
hlcoord 16, 8
@@ -7595,8 +7595,8 @@ Function117bb6:
jp MobileStudium_JumptableIncrement
Function117c4a:
- ld hl, MenuDataHeader_117cbc
- call LoadMenuDataHeader
+ ld hl, MenuHeader_117cbc
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
farcall ReloadMapPart
@@ -7656,13 +7656,13 @@ Function117c89:
call CloseSRAM
ret
-MenuDataHeader_117cbc: ; 0x117cbc
+MenuHeader_117cbc: ; 0x117cbc
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
db 0 ; default option
-MenuDataHeader_117cc4: ; 0x117cc4
+MenuHeader_117cc4: ; 0x117cc4
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm
index 438f42107..1edafb47c 100755
--- a/mobile/mobile_45_sprite_engine.asm
+++ b/mobile/mobile_45_sprite_engine.asm
@@ -506,7 +506,7 @@ Function1161d5: ; 1161d5
; 11628c
-MenuDataHeader_11628c: ; 11628c
+MenuHeader_11628c: ; 11628c
db MENU_BACKUP_TILES ; flags
menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 0298c075b..e8a69a7de 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1184,8 +1184,8 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
ld a, [$c31a]
and a
ret nz
- ld hl, MenuDataHeader_119cf7
- call LoadMenuDataHeader
+ ld hl, MenuHeader_119cf7
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
call ApplyTilemap
@@ -1199,15 +1199,15 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
ld a, $1
ld [rSVBK], a
ld a, [wStatusFlags]
- bit 6, a ; Hall Of Fame
+ bit STATUSFLAGS_HALL_OF_FAME_F, a
jr nz, .asm_11896b
- ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels
- ld a, 5 ; 4 levels to choose from, including 'Cancel'-option
+ ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels
+ ld a, 5 ; 4 levels to choose from, including 'Cancel'-option
jr .asm_118970
.asm_11896b
- ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels
- ld a, 11 ; 10 levels to choose from, including 'Cancel'-option
+ ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels
+ ld a, 11 ; 10 levels to choose from, including 'Cancel'-option
.asm_118970
ld [wcd4a], a
@@ -1672,7 +1672,7 @@ Function118ded: ; 118ded
push af
ld a, $1
ld [rSVBK], a
- farcall Special_Function11b93b
+ farcall Function11b93b
pop af
ld [rSVBK], a
@@ -3953,7 +3953,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu:
ret
; 119cf7
-MenuDataHeader_119cf7: ; 119cf7
+MenuHeader_119cf7: ; 119cf7
db MENU_BACKUP_TILES ; flags
menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
@@ -4105,12 +4105,10 @@ BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e)
XGameCodePrefix: ; 119e33
INCBIN "data/mobile/x-game-code-prefix.txt"
-XGameCodePrefixEnd:
;119e40
XGameResultPrefix: ; 119e40
INCBIN "data/mobile/x-game-result-prefix.txt"
-XGameResultPrefixEnd:
; 119e4f
Function119e4f: ; 119e4f
@@ -4637,8 +4635,8 @@ Function11a1ff: ; 11a1ff
; 11a207
BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207
- ld hl, MenuDataHeader_11a2de
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11a2de
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
call ApplyTilemap
@@ -4753,14 +4751,14 @@ String_11a2d3: ; 11a2d3
db "NO@"
; 11a2d6
-MenuDataHeader_11a2d6: ; 11a2d6
+MenuHeader_11a2d6: ; 11a2d6
db MENU_BACKUP_TILES ; flags
menu_coords 14, 6, SCREEN_WIDTH - 1, 10
dw NULL
db 0 ; default option
; 11a2de
-MenuDataHeader_11a2de: ; 11a2de
+MenuHeader_11a2de: ; 11a2de
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
@@ -5323,7 +5321,7 @@ String_11a7f4: ; 11a7f4
db "　　　　　　　　　　　　　　　@"
; 11a804
-MenuDataHeader_11a804: ; 11a804
+MenuHeader_11a804: ; 11a804
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, 5
dw NULL
@@ -5724,7 +5722,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
done
; 0x11ac3e
-Special_Function11ac3e: ; 11ac3e
+Function11ac3e: ; 11ac3e
call SpeechTextBox
call FadeToMenu
callfar ClearSpriteAnims2
@@ -5902,8 +5900,8 @@ Function11ad8f: ; 11ad8f
; 11ad95
Function11ad95: ; 11ad95
- ld hl, MenuDataHeader_11ae38
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11ae38
+ call LoadMenuHeader
call MenuBox
hlcoord 12, 12
ld de, String_11ae40
@@ -5994,7 +5992,7 @@ Function11adc4:
ret
; 11ae38
-MenuDataHeader_11ae38: ; 11ae38
+MenuHeader_11ae38: ; 11ae38
db MENU_BACKUP_TILES ; flags
menu_coords 10, 10, 17, SCREEN_HEIGHT - 1
dw NULL
@@ -6009,14 +6007,14 @@ String_11ae40: ; 11ae40
; 11ae4e
Function11ae4e: ; 11ae4e
- ld hl, MenuDataHeader_11afe8
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11afe8
+ call LoadMenuHeader
call MenuBox
hlcoord 10, 14
ld de, String_11aff0
call PlaceString
- ld hl, MenuDataHeader_11b013
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11b013
+ call LoadMenuHeader
call MenuBox
hlcoord 16, 8
ld de, String_11b01b
@@ -6100,14 +6098,14 @@ Function11ae98:
; 11af04
Function11af04: ; 11af04
- ld hl, MenuDataHeader_11afe8
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11afe8
+ call LoadMenuHeader
call MenuBox
hlcoord 10, 14
ld de, String_11b003
call PlaceString
- ld hl, MenuDataHeader_11b013
- call LoadMenuDataHeader
+ ld hl, MenuHeader_11b013
+ call LoadMenuHeader
call MenuBox
hlcoord 16, 8
ld de, String_11b01b
@@ -6240,7 +6238,7 @@ Function11afd6: ; 11afd6
ret
; 11afe8
-MenuDataHeader_11afe8: ; 11afe8
+MenuHeader_11afe8: ; 11afe8
db MENU_BACKUP_TILES ; flags
menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
@@ -6257,7 +6255,7 @@ String_11b003: ; 11b003
next "ちゅうししますか？@"
; 11b013
-MenuDataHeader_11b013: ; 11b013
+MenuHeader_11b013: ; 11b013
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw NULL
@@ -7052,7 +7050,7 @@ Function11b3d9: ; 11b3d9
ret
; 11b444
-Special_Function11b444: ; 11b444
+Function11b444: ; 11b444
; special
call Mobile46_InitJumptable
call Mobile46_RunJumptable
@@ -7341,7 +7339,7 @@ Function11b5e7: ; 11b5e7
ret
; 11b5e8
-Special_Function11b5e8: ; 11b5e8
+Function11b5e8: ; 11b5e8
ld a, $0
call GetSRAMBank
ld hl, wRTC
@@ -7577,7 +7575,7 @@ Function11b6b4: ; 11b6b4
ret
; 11b7e5
-Special_Function11b7e5: ; 11b7e5
+Function11b7e5: ; 11b7e5
ld a, [$c60d] ; species
ld [wOTTrademonSpecies], a
ld [wCurPartySpecies], a
@@ -7636,7 +7634,7 @@ Special_Function11b7e5: ; 11b7e5
ret
; 11b879
-Special_Function11b879: ; 11b879
+Function11b879: ; 11b879
farcall BattleTower_CheckSaveFileExistsAndIsYours
ld a, [wScriptVar]
and a
@@ -7729,7 +7727,7 @@ Special_Function11b879: ; 11b879
ret
; 11b920
-Special_Function11b920: ; 11b920
+Function11b920: ; 11b920
call Mobile46_InitJumptable
ld a, $5
call GetSRAMBank
@@ -7742,7 +7740,7 @@ Special_Function11b920: ; 11b920
ret
; 11b93b
-Special_Function11b93b: ; 11b93b
+Function11b93b: ; 11b93b
ld a, $5
call GetSRAMBank
xor a
@@ -7886,7 +7884,7 @@ AddMobileMonToParty: ; 11b98f
ret
; 11ba38
-Special_Function11ba38: ; 11ba38
+Function11ba38: ; 11ba38
farcall CheckCurPartyMonFainted
ret c
xor a
diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm
index a35c85641..a1bd0ae35 100755
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -681,8 +681,8 @@ Function16cbd1: ; 16cbd1
ld bc, 2
ld hl, Unknown_16cfa3
call AddNTimes
- ld de, wBGPals1 + 1 palettes + 4
- ld bc, 2
+ ld de, wBGPals1 palette 1 color 2
+ ld bc, PAL_COLOR_SIZE
ld a, $5
call FarCopyWRAM
farcall ApplyPals
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index 474dde270..3f7dcbc43 100755
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -615,8 +615,8 @@ Function171beb: ; 171beb (5c:5beb)
ld a, [wcd4a]
ld [$aa4a], a
call CloseSRAM
- ld hl, MenuDataHeader_171c6b
- call LoadMenuDataHeader
+ ld hl, MenuHeader_171c6b
+ call LoadMenuHeader
call MenuBox
call MenuBoxCoord2Tile
farcall ReloadMapPart
@@ -671,7 +671,7 @@ Function171c66: ; 171c66 (5c:5c66)
; 171c6b (5c:5c6b)
-MenuDataHeader_171c6b: ; 171c6b
+MenuHeader_171c6b: ; 171c6b
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw NULL
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index 3436d85b9..850096705 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -424,7 +424,7 @@ Function17a91e: ; 17a91e (5e:691e)
ret
.asm_17a92c
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call Function17a99e
ld hl, $d088
set 7, [hl]
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index be9578d22..fc32032c0 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -328,14 +328,14 @@ Function17d0f3: ; 17d0f3
; 17d187
Mobile_CopyDefaultOTName: ; 17d187
- ld hl, Mobile5F_KrissName
+ ld hl, Mobile5F_PlayersName
ld de, $c63d
ld bc, 5
call CopyBytes
ret
; 17d194
-Mobile5F_KrissName:
+Mobile5F_PlayersName:
db "クりス@@"
; 17d198
@@ -371,7 +371,7 @@ Mobile_CopyDefaultMailAuthor: ; 17d1c9
ld de, $c668
ld bc, 5
call ByteFill
- ld hl, Mobile5F_KrissName
+ ld hl, Mobile5F_PlayersName
ld de, $c668
ld bc, 5
call CopyBytes
@@ -435,22 +435,22 @@ Function17d1f1: ; 17d1f1
; if [wScriptVar] == TRUE
; Show BattleTower-Menu with 3 options in english language
; - Challenge - Explanation - Cancel
-Special_Menu_ChallengeExplanationCancel: ; 17d224
+Menu_ChallengeExplanationCancel: ; 17d224
ld a, [wScriptVar]
and a
jr nz, .English
ld a, $4
ld [wScriptVar], a
- ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
+ ld hl, MenuHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
jr .Load_Interpret
.English:
ld a, $4
ld [wScriptVar], a
- ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu
+ ld hl, MenuHeader_ChallengeExplanationCancel ; English Menu
.Load_Interpret:
- call LoadMenuDataHeader
+ call LoadMenuHeader
call Function17d246
call CloseWindow
ret
@@ -482,13 +482,13 @@ Function17d246: ; 17d246
ret
; 17d26a
-MenuDataHeader_17d26a: ; 17d26a
+MenuHeader_17d26a: ; 17d26a
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 14, 9
- dw MenuData2_17d272
+ dw MenuData_17d272
db 1 ; default option
-MenuData2_17d272: ; 17d272
+MenuData_17d272: ; 17d272
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 4
db "ニュース¯よみこむ@"
@@ -497,13 +497,13 @@ MenuData2_17d272: ; 17d272
db "やめる@"
; 17d28f
-MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
+MenuHeader_ChallengeExplanationCancel: ; 17d28f
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 14, 7
- dw MenuData2_ChallengeExplanationCancel
+ dw MenuData_ChallengeExplanationCancel
db 1 ; default option
-MenuData2_ChallengeExplanationCancel: ; 17d297
+MenuData_ChallengeExplanationCancel: ; 17d297
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 3
db "Challenge@"
@@ -511,7 +511,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297
db "Cancel@"
; 17d2b6
-Special_Function17d2b6: ; 17d2b6
+Function17d2b6: ; 17d2b6
call Function17d2c0
farcall Function1181da
ret
@@ -526,7 +526,7 @@ Function17d2c0: ; 17d2c0
ret
; 17d2ce
-Special_Function17d2ce: ; 17d2ce
+Function17d2ce: ; 17d2ce
ld a, $5
call GetSRAMBank
ld a, [$aa72]
@@ -1907,7 +1907,7 @@ Function17dc1f: ; 17dc1f
ld a, $1
ld [$c70f], a
ld hl, $c708
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
jr nc, .asm_17dc6e
ld a, $2
@@ -1940,7 +1940,7 @@ Function17dc1f: ; 17dc1f
ret
; 17dc96
-MenuData2_17dc96:
+MenuData_17dc96:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 2
db "はい@"
@@ -4586,7 +4586,7 @@ Function17f524: ; 17f524
jr .asm_17f536
; 17f53d
-Special_BattleTowerMobileError: ; 17f53d
+BattleTowerMobileError: ; 17f53d
call FadeToMenu
xor a
ld [wc303], a
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index 8de1f0f5e..a60091d4c 100755
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -171,7 +171,7 @@ Function4a098: ; 4a098 (12:6098)
call MenuClickSound
call PlaceHollowCursor
call WaitBGMap
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
farcall Function89de0
call Call_ExitMenu
call MG_Mobile_Layout_LoadPals
@@ -389,7 +389,7 @@ Function4a28a: ; 4a28a (12:628a)
call Function4a6d8
call PlaceHollowCursor
call WaitBGMap
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
ld a, $5
call GetSRAMBank
ld a, [$aa4b]
@@ -433,8 +433,8 @@ Function4a28a: ; 4a28a (12:628a)
ld c, 4
call TextBox
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
- ld hl, DeletePassword_YesNo_MenuDataHeader
- call LoadMenuDataHeader
+ ld hl, DeletePassword_YesNo_MenuHeader
+ call LoadMenuHeader
call VerticalMenu
bit B_BUTTON_F, a
jr nz, .dont_delete_password
@@ -460,7 +460,7 @@ Function4a28a: ; 4a28a (12:628a)
ret
; 4a346 (12:6346)
-MenuDataHeader_0x4a346: ; 0x4a346
+MenuHeader_0x4a346: ; 0x4a346
db MENU_BACKUP_TILES ; flags
menu_coords 12, 0, SCREEN_WIDTH - 1, 6
@@ -482,14 +482,14 @@ UnknownText_0x4a35d: ; 0x4a35d
db "@"
; 0x4a362
-DeletePassword_YesNo_MenuDataHeader: ; 0x4a362
+DeletePassword_YesNo_MenuHeader: ; 0x4a362
db MENU_BACKUP_TILES ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
- dw MenuData2_0x4a36a
+ dw MenuData_0x4a36a
db 2 ; default option
; 0x4a36a
-MenuData2_0x4a36a: ; 0x4a36a
+MenuData_0x4a36a: ; 0x4a36a
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
db 2 ; items
db "はい@"
@@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab)
call ClearBGPalettes
ld b, SCGB_DIPLOMA
call GetSGBLayout
- farcall Special_Function11c1ab
+ farcall Function11c1ab
pop bc
call LoadFontsExtra
jp Function4a4c4
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:21:47 +0000