summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_47.asm8
-rw-r--r--misc/mobile_22.asm14
-rw-r--r--misc/mobile_22_2.asm8
-rw-r--r--misc/mobile_40.asm76
-rw-r--r--misc/mobile_45.asm12
-rwxr-xr-xmisc/mobile_46.asm50
-rwxr-xr-xmisc/mobile_5b.asm2
-rwxr-xr-xmisc/mobile_5c.asm2
-rw-r--r--misc/mobile_5f.asm8
9 files changed, 90 insertions, 90 deletions
diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm
index d66525916..8cf670c80 100755
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -368,7 +368,7 @@ Function11c1ca: ; 11c1ca
ld [wcd2b], a
ld a, $ff
ld [wcd24], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
call Function11c254
call WhiteBGMap
@@ -1813,7 +1813,7 @@ String_11cb31: ; 11cb31
Function11cb52: ; 11cb52 (47:4b52)
ld hl, Unknown_11cc01
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
.asm_11cb58
dec a
jr z, .asm_11cb5f
@@ -1851,7 +1851,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld a, $4
call GetSRAMBank
ld hl, $a007
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
sla a
sla a
@@ -1874,7 +1874,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld de, Unknown_11cfc6
call Function11cfce
ld hl, Unknown_11cc7e
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
.asm_11cbba
dec a
jr z, .asm_11cbc1
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 716ad50a3..f529b5bc7 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -259,7 +259,7 @@ Function89261: ; 89261
call Function8920f
pop af
jr c, .done
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $2
jr z, .done
and a
@@ -2222,7 +2222,7 @@ asm_89d90: ; 89d90 (22:5d90)
push hl
call _hl_
call Function89dab
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
push af
call Function891ab
pop af
@@ -2253,7 +2253,7 @@ Function89dab: ; 89dab (22:5dab)
call PlayClickSFX
ld a, [wcfa3]
ld c, a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp c
jr z, .asm_89dd9
call Function1bee
@@ -2273,7 +2273,7 @@ Function89de0: ; 89de0 (22:5de0)
.asm_89dea
call Function8a31c
jr z, .asm_89dfd
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld c, a
push bc
ld hl, Jumptable_89e04
@@ -2782,7 +2782,7 @@ Function8a116: ; 8a116 (22:6116)
call Function8923c
call Function8a17b
jr c, .asm_8a16b
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wd030], a
dec d
jr z, .asm_8a140
@@ -2865,7 +2865,7 @@ Function8a1b0: ; 8a1b0
ld c, $12
call TextBox
hlcoord 1, 14
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld de, Strings_8a1cc
dec a
ld c, a
@@ -3104,7 +3104,7 @@ Function8a383: ; 8a383 (22:6383)
ret
Function8a3a2: ; 8a3a2 (22:63a2)
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld hl, DefaultFlypoint
ld e, a
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index 40196ae9a..6502d9043 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -854,7 +854,7 @@ Function8b7bd: ; 8b7bd
.asm_8b824
ld c, a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wd030], a
ld a, [wd0e4]
ld [wd031], a
@@ -863,7 +863,7 @@ Function8b7bd: ; 8b7bd
Function8b832: ; 8b832
ld a, [wd0e4]
- ld hl, wcf92
+ ld hl, wMenuData2Items
sub [hl]
jr nc, Function8b84b
xor a
@@ -872,7 +872,7 @@ Function8b832: ; 8b832
Function8b83e: ; 8b83e
ld a, [wd0e4]
- ld hl, wcf92
+ ld hl, wMenuData2Items
add [hl]
cp $24
jr c, Function8b84b
@@ -880,7 +880,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b
ld [wd0e4], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wMenuCursorBuffer], a
ret
; 8b855
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index c8fba9be1..a777be7b9 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -901,7 +901,7 @@ Function100597: ; 100597
ret z
jr nc, .asm_1005a6
xor a
- ld [wcfa9], a
+ ld [MenuSelection2], a
.asm_1005a6
call ExitMenu
@@ -953,7 +953,7 @@ Function1005e1: ; 1005e1
ret z
jr nc, .asm_1005f0
xor a
- ld [wcfa9], a
+ ld [MenuSelection2], a
.asm_1005f0
call ExitMenu
ld a, [wcd26]
@@ -1882,16 +1882,16 @@ Function100bc2: ; 100bc2
jr .asm_100bd1
.asm_100bff
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
and a
jp nz, .asm_100bcb
ld a, [wd0eb]
inc a
- ld [wcfa9], a
+ ld [MenuSelection2], a
jp .asm_100bcb
.asm_100c10
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld b, a
ld a, [wd0eb]
rept 2
@@ -1900,11 +1900,11 @@ endr
cp b
jp nz, .asm_100bcb
ld a, $1
- ld [wcfa9], a
+ ld [MenuSelection2], a
jp .asm_100bcb
.asm_100c25
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld [CurMoveNum], a
ld a, $1
@@ -1912,10 +1912,10 @@ endr
ret
.asm_100c30
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld [CurMoveNum], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld c, a
ld b, 0
@@ -1930,7 +1930,7 @@ endr
dec a
cp c
jr z, .asm_100c63
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld c, a
ld b, 0
@@ -1978,7 +1978,7 @@ Function100c98: ; 100c98
ld [wcfa3], a
ld a, [CurMoveNum]
inc a
- ld [wcfa9], a
+ ld [MenuSelection2], a
ret
; 100cad
@@ -2007,7 +2007,7 @@ Function100cb5: ; 100cb5
ld a, [PartyCount]
inc a
ld b, a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp b
jr z, .asm_100d17
ld [wd0d8], a
@@ -2015,7 +2015,7 @@ Function100cb5: ; 100cb5
ld b, a
bit 1, b
jr nz, .asm_100d17
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld [CurPartyMon], a
ld c, a
@@ -2084,7 +2084,7 @@ Function100d67: ; 100d67
call CopyMenuDataHeader
xor a
ld [hBGMapMode], a
- call Function1cbb
+ call MenuBox
call UpdateSprites
call Function1c89
call WaitBGMap
@@ -4141,7 +4141,7 @@ Function101b2b: ; 101b2b
call Function1013dd
ld a, $0
ld [wcd26], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr z, .asm_101b51
ld a, $2
@@ -4194,7 +4194,7 @@ Function101b8f: ; 101b8f
call Function1013dd
ld a, $0
ld [wcd26], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr z, .asm_101bbc
ld a, $1
@@ -4238,7 +4238,7 @@ Function101be5: ; 101be5
call Function1013dd
ld a, $0
ld [wcd26], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr nz, .asm_101c0b
ld a, $2a
@@ -5330,7 +5330,7 @@ Function102387: ; 102387
call Function102d9a
call Function102dd3
ld a, $1
- ld [wcfa9], a
+ ld [MenuSelection2], a
Function1023a1: ; 1023a1
call Function102283
@@ -5696,20 +5696,20 @@ Function1025ff: ; 1025ff
ret
.asm_10262e
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld b, a
ld a, [OTPartyCount]
cp b
ret nz
call Function1bf7
ld a, [PartyCount]
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, $1d
ld [wcd49], a
ret
.asm_102646
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
ret nz
ld a, $23
@@ -5758,7 +5758,7 @@ Function10266b: ; 10266b
ret
.asm_10269a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ret nz
call Function1bf7
@@ -5767,7 +5767,7 @@ Function10266b: ; 10266b
ret
.asm_1026a8
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld b, a
ld a, [PartyCount]
cp b
@@ -5827,7 +5827,7 @@ Function1026f3: ; 1026f3
hlcoord 9, 17
ld [hl], $7f
ld a, $1
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, $1d
ld [wcd49], a
ret
@@ -5836,7 +5836,7 @@ Function1026f3: ; 1026f3
hlcoord 9, 17
ld [hl], $7f
ld a, [OTPartyCount]
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, $1f
ld [wcd49], a
ret
@@ -5947,7 +5947,7 @@ asm_1027c6:
asm_1027d1:
ld hl, wcd4b
set 3, [hl]
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wcd4c], a
ld a, $7
ld [wcd49], a
@@ -5978,7 +5978,7 @@ String_102804: ; 102804
; 102814
Function102814: ; 102814
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wcd52], a
ld a, [wcd4c]
dec a
@@ -6030,7 +6030,7 @@ Function10286f: ; 10286f
call Function1028fc
ret nc
ld a, [wcd52]
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, [wcd51]
cp $8
jr nz, .asm_102886
@@ -6062,7 +6062,7 @@ Function1028a5: ; 1028a5
Function1028ab: ; 1028ab
ld a, [wcd52]
- ld [wcfa9], a
+ ld [MenuSelection2], a
call Function102f15
ld hl, wcd4b
set 1, [hl]
@@ -6288,7 +6288,7 @@ Function1029fe: ; 1029fe
push af
call ExitMenu
pop af
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr nz, .asm_102a21
ld a, $1
@@ -6439,12 +6439,12 @@ Function102b32: ; 102b32
Function102b4e: ; 102b4e
ld a, $1
ld [MonType], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
push af
ld de, Unknown_102b73
call Function1bb1
pop af
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, [OTPartyCount]
ld [wcfa3], a
ret
@@ -6464,12 +6464,12 @@ Unknown_102b73:
Function102b7b: ; 102b7b
xor a
ld [MonType], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
push af
ld de, Unknown_102b94
call Function1bb1
pop af
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld a, [PartyCount]
ld [wcfa3], a
ret
@@ -6489,7 +6489,7 @@ Function102b9c: ; 102b9c
; 102bac
Function102bac: ; 102bac
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld [CurPartyMon], a
call LowVolume
@@ -6497,7 +6497,7 @@ Function102bac: ; 102bac
callba Function4dc8f
ld a, [CurPartyMon]
inc a
- ld [wcfa9], a
+ ld [MenuSelection2], a
call Function102d9a
call ClearPalettes
call DelayFrame
@@ -7695,7 +7695,7 @@ Function103612: ; 103612
call InterpretMenu2
call WriteBackup
jr c, .asm_10363b
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [ScriptVar], a
ld c, a
ld a, [wdc40]
@@ -7783,7 +7783,7 @@ Mobile_SelectThreeMons: ; 10366e
call InterpretMenu2
call ExitMenu
jr c, .asm_1036f4
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr z, .asm_1036d9
cp $2
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 373834193..c250da03f 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7972,11 +7972,11 @@ Function11784c: ; 11784c (45:784c)
Function1178aa: ; 1178aa (45:78aa)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
ld hl, MenuDataHeader_1179bd
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
callba Function104061
hlcoord 16, 8
@@ -8075,7 +8075,7 @@ asm_11797e: ; 11797e (45:797e)
Function117984: ; 117984 (45:7984)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
callba Function104061
hlcoord 1, 14
@@ -8235,7 +8235,7 @@ Function117b14:
ret nz
ld hl, Data117cbc
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
jp Function117cdd
@@ -8247,7 +8247,7 @@ Function117b28:
Function117b31:
ld hl, Data117cc4
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
hlcoord 16, 8
ld de, YesNo117ccc
@@ -8385,7 +8385,7 @@ Function117bb6:
Function117c4a:
ld hl, Data117cbc
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
callba Function104061
ld hl, MobileStadiumSuccessText
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 1c0b56afa..37d0223a2 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -1284,7 +1284,7 @@ Function118936:
ret nz
ld hl, MenuDataHeader_119cf7
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
call Function321c
hlcoord 16, 8, AttrMap
@@ -4739,7 +4739,7 @@ Function11a1ff: ; 11a1ff
Function11a207: ; 11a207
ld hl, MenuDataHeader_11a2de
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
call Function321c
hlcoord 16, 8
@@ -5954,7 +5954,7 @@ Function11ad1b: ; 11ad1b
call ClearSprites
call ClearTileMap
callba Function17c000
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld [wcd82], a
dec a
ld [hObjectStructIndexBuffer], a
@@ -6018,7 +6018,7 @@ Function11ad8f: ; 11ad8f
Function11ad95: ; 11ad95
ld hl, MenuDataHeader_11ae38
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
hlcoord 12, 12
ld de, String_11ae40
call PlaceString
@@ -6028,7 +6028,7 @@ Function11ad95: ; 11ad95
callba Function104061
call Function11ad8a
ld a, $1
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afcc
call Function11afb7
@@ -6055,13 +6055,13 @@ Function11adc4:
jr .asm_11ae2e
.asm_11ade6
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ret z
jr .asm_11adf4
.asm_11aded
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
inc a
cp $4
ret z
@@ -6071,21 +6071,21 @@ Function11adc4:
ld hl, Unknown_11afcc
call Function11afbb
pop af
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afcc
call Function11afb7
ret
.asm_11ae06
call PlayClickSFX
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld hl, wcd30
ld [hl], a
and a
jr z, .asm_11ae28
hlcoord 2, 14
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $2
jr z, .asm_11ae23
call Function11b272
@@ -6126,13 +6126,13 @@ String_11ae40: ; 11ae40
Function11ae4e: ; 11ae4e
ld hl, MenuDataHeader_11afe8
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
hlcoord 10, 14
ld de, String_11aff0
call PlaceString
ld hl, MenuDataHeader_11b013
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
hlcoord 16, 8
ld de, String_11b01b
call PlaceString
@@ -6145,7 +6145,7 @@ Function11ae4e: ; 11ae4e
callba Function104061
call Function11ad8a
ld a, $1
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6176,13 +6176,13 @@ Function11ae98:
jr .asm_11aef7
.asm_11aec1
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ret z
jr .asm_11aecf
.asm_11aec8
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
inc a
cp $3
ret z
@@ -6192,14 +6192,14 @@ Function11ae98:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11aee1
call PlayClickSFX
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $2
jr z, .asm_11aeb4
ld a, [wcd4b]
@@ -6217,13 +6217,13 @@ Function11ae98:
Function11af04: ; 11af04
ld hl, MenuDataHeader_11afe8
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
hlcoord 10, 14
ld de, String_11b003
call PlaceString
ld hl, MenuDataHeader_11b013
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
hlcoord 16, 8
ld de, String_11b01b
call PlaceString
@@ -6236,7 +6236,7 @@ Function11af04: ; 11af04
callba Function104061
call Function11ad8a
ld a, $2
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6267,13 +6267,13 @@ Function11af4e:
jr .asm_11afaa
.asm_11af77
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ret z
jr .asm_11af85
.asm_11af7e
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
inc a
cp $3
ret z
@@ -6283,14 +6283,14 @@ Function11af4e:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [wcfa9], a
+ ld [MenuSelection2], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11af97
call PlayClickSFX
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $2
jr z, .asm_11af6a
ld a, $6
@@ -6313,7 +6313,7 @@ Function11afbb:
ld e, $7f
asm_11afbd:
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
dec a
ld c, a
ld b, 0
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 43cf8f987..dd661851d 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -1168,7 +1168,7 @@ Function16d77a: ; 16d77a
swap a
and $f
ld c, a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
ld b, a
xor a
dec b
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 2cb0cccf0..6a0de4e47 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -2270,7 +2270,7 @@ Function171beb: ; 171beb (5c:5beb)
call CloseSRAM
ld hl, MenuDataHeader_171c6b
call LoadMenuDataHeader
- call Function1cbb
+ call MenuBox
call GetMemTileCoord
callba Function104061
hlcoord 1, 14
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index e1928a440..5ef47e8ff 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -462,7 +462,7 @@ Function17d246: ; 17d246
ld a, [ScriptVar]
cp $5
jr nz, .asm_17d25d
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $3
ret z
jr c, .asm_17d25d
@@ -470,7 +470,7 @@ Function17d246: ; 17d246
jr .asm_17d260
.asm_17d25d
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
.asm_17d260
ld [ScriptVar], a
@@ -1932,13 +1932,13 @@ Function17dc1f: ; 17dc1f
call InterpretMenu2
jr nc, .asm_17dc6e
ld a, $2
- ld [wcfa9], a
+ ld [MenuSelection2], a
.asm_17dc6e
call WriteBackup
pop af
ld [rSVBK], a
- ld a, [wcfa9]
+ ld a, [MenuSelection2]
cp $1
jr nz, .asm_17dc85
ld a, [$c68a]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 05:52:51 +0000