engine/mart.asm

4 files changed, 106 insertions, 106 deletions

diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index 0abe8637c..c04f933fe 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -828,7 +828,7 @@ Function8b7bd: ; 8b7bd
 	call Function8b75d
 	call UpdateSprites
 	call Function89209
-	call Function350c
+	call HandleScrollingMenu
 	call Function8920f
 	ld a, [wcf73]
 	cp $2
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 7589725da..5f41f9332 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -86,7 +86,7 @@ Function100082: ; 100082
 	ld [hMapAnims], a
 	ld [hLCDStatCustom], a
 	ld a, $1
-	ld [$ffc9], a
+	ld [hFFC9], a
 	ld [hMobile], a
 	ei
 	ret
@@ -95,7 +95,7 @@ Function100082: ; 100082
 Function1000a4: ; 1000a4
 	di
 	xor a
-	ld [$ffc9], a
+	ld [hFFC9], a
 	ld [hMobile], a
 	xor a
 	ld [hVBlank], a
@@ -168,7 +168,7 @@ Function1000fa: ; 1000fa
 	and $13
 	ld [rIE], a
 	xor a
-	ld [$ffc9], a
+	ld [hFFC9], a
 	ld [hMobile], a
 	ei
 	ld a, [wLinkMode]
@@ -176,7 +176,7 @@ Function1000fa: ; 1000fa
 	xor a
 	ld [wLinkMode], a
 	ld a, $4
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	callba Function11619d
 	ld hl, wcd29
 	set 6, [hl]
@@ -4393,7 +4393,7 @@ Function101cc2: ; 101cc2 ; unreferenced
 
 Function101cc8: ; 101cc8
 	ld a, $1
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ld a, $1
 	ld [wc30d], a
 	ld hl, wcd29
@@ -4406,7 +4406,7 @@ Function101cc8: ; 101cc8
 
 Function101cdf: ; 101cdf
 	ld a, $6
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ld a, $1
 	ld [wc30d], a
 	ld hl, wcd29
@@ -4419,7 +4419,7 @@ Function101cdf: ; 101cdf
 
 Function101cf6: ; 101cf6
 	ld a, $b
-	ld [wPartyMonMenuIconAnims + 1], a
+	ld [wc314 + 1], a
 	ld a, [wcd25]
 	inc a
 	ld [wcd25], a
@@ -4428,7 +4428,7 @@ Function101cf6: ; 101cf6
 
 Function101d03: ; 101d03
 	ld a, $e
-	ld [wPartyMonMenuIconAnims + 1], a
+	ld [wc314 + 1], a
 	ld a, [wcd25]
 	inc a
 	ld [wcd25], a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 193baee00..3055ca988 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5588,14 +5588,14 @@ INCBIN "gfx/unknown/11601a.2bpp"
 Function11615a: ; 11615a
 	xor a
 	ld [wc30d], a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld [wc310], a
 	ld [wc311], a
 	ld [wc312], a
 	ld [wc313], a
-	ld [wPartyMonMenuIconAnims], a
-	ld [wPartyMonMenuIconAnims + 1], a
-	ld [wPartyMonMenuIconAnims + 4], a
+	ld [wc314], a
+	ld [wc314 + 1], a
+	ld [wc314 + 4], a
 	ld [wc3f6], a
 	ld [wc3f8], a
 	ld [wc3f2], a
@@ -5617,7 +5617,7 @@ Function11619d: ; 11619d
 	ld a, [wc30d]
 	and a
 	ret z
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	cp $2
 	jr c, .asm_1161b4
 	ld a, $a0
@@ -5631,7 +5631,7 @@ Function11619d: ; 11619d
 ; 1161b8
 
 Function1161b8: ; 1161b8
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_1161c7
@@ -5758,9 +5758,9 @@ Function1161d5: ; 1161d5
 	ld [wc2a9], a
 	ld a, d
 	ld [wc2aa], a
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	inc a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ret
 ; 11628c
 
@@ -5774,15 +5774,15 @@ MenuDataHeader_11628c: ; 11628c
 
 Function116294: ; 116294
 	callba Function170d02
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	inc a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld a, [rSVBK]
 	push af
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, wd030
-	ld de, wPartyMonMenuIconAnims + 12
+	ld de, wc314 + 12
 	ld bc, $0010
 	call CopyBytes
 	ld hl, Palette_11734e
@@ -5799,9 +5799,9 @@ Function116294: ; 116294
 
 Function1162cb: ; 1162cb
 	callba Function170cc6
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	inc a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -5838,7 +5838,7 @@ Function1162f2: ; 1162f2
 	ld c, a
 	ld a, [wc30f]
 	ld b, a
-	ld a, [wPartyMonMenuIconAnims + 4]
+	ld a, [wc314 + 4]
 	ld e, a
 	ld a, [hli]
 	sub e
@@ -5939,7 +5939,7 @@ Function11636e: ; 11636e
 	xor a
 	ld [wc2aa], a
 	xor a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld [wc30d], a
 	ret
 ; 1163c0
@@ -5961,7 +5961,7 @@ Function1163c0: ; 1163c0
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wPartyMonMenuIconAnims + 12
+	ld hl, wc314 + 12
 	ld de, wd030
 	ld bc, $0010
 	call CopyBytes
@@ -5997,7 +5997,7 @@ Function1163c0: ; 1163c0
 
 .asm_116439
 	xor a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld [wc30d], a
 	ret
 ; 116441
@@ -6014,14 +6014,14 @@ Function116441: ; 116441
 	xor a
 	ld [wc2aa], a
 	xor a
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld [wc30d], a
 	ret
 ; 116468
 
 Function116468: ; 116468
 	call Function116567
-	ld a, [wPartyMonMenuIconAnims]
+	ld a, [wc314]
 	cp $d
 	jr nz, .asm_1164a8
 	ld hl, wc30e
@@ -6213,7 +6213,7 @@ Function116567: ; 116567
 ; 11659d
 
 Function11659d: ; 11659d
-	ld a, [wPartyMonMenuIconAnims]
+	ld a, [wc314]
 	cp $12
 	ret nc
 	ld e, a
@@ -6289,7 +6289,7 @@ Function116600:
 	call Function116780
 	ret c
 	ld a, $2
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ret
 ; 116615
 
@@ -6332,24 +6332,24 @@ Function116640:
 	call Function116780
 	ret c
 	ld a, $7
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ret
 ; 116655
 
 Function116655: ; 116655
 	xor a
-	ld [wPartyMonMenuIconAnims + 3], a
+	ld [wc314 + 3], a
 	call Function11678e
 
 Function11665c:
-	ld hl, wPartyMonMenuIconAnims + 3
+	ld hl, wc314 + 3
 	ld a, $1
 	xor [hl]
 	ld [hl], a
 	add $4
 	ld c, a
 	call Function11679c
-	ld a, [wPartyMonMenuIconAnims + 3]
+	ld a, [wc314 + 3]
 	and a
 	jr nz, .asm_116673
 	ld a, $48
@@ -6378,7 +6378,7 @@ Function11668d:
 	call Function116780
 	ret c
 	ld a, $c
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ret
 ; 11669f
 
@@ -6393,9 +6393,9 @@ Function1166a2:
 	ld [wc30f], a
 	ld [wc3f3], a
 	ld a, $ff
-	ld [wPartyMonMenuIconAnims + 2], a
+	ld [wc314 + 2], a
 	xor a
-	ld [wPartyMonMenuIconAnims + 3], a
+	ld [wc314 + 3], a
 	ld a, $0
 	ld c, a
 	call Function11679c
@@ -6417,25 +6417,25 @@ Function1166d6:
 	cp $48
 	jr nz, .asm_1166e4
 	xor a
-	ld [wPartyMonMenuIconAnims + 2], a
+	ld [wc314 + 2], a
 
 .asm_1166e4
 	ld a, [wc311]
 	cp $ff
 	ret nz
 	ld a, $4
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	xor a
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	ret
 ; 1166f4
 
 Function1166f4: ; 1166f4
 	ld [wc30e], a
 	ld a, b
-	ld [wPartyMonMenuIconAnims + 2], a
+	ld [wc314 + 2], a
 	xor a
-	ld [wPartyMonMenuIconAnims + 3], a
+	ld [wc314 + 3], a
 	ld hl, wc30f
 .asm_116702
 	call Random
@@ -6460,9 +6460,9 @@ Function1166f4: ; 1166f4
 Function11671f: ; 11671f
 	ld [wc30f], a
 	ld a, b
-	ld [wPartyMonMenuIconAnims + 3], a
+	ld [wc314 + 3], a
 	xor a
-	ld [wPartyMonMenuIconAnims + 2], a
+	ld [wc314 + 2], a
 	ld hl, wc30e
 .asm_11672d
 	call Random
@@ -6482,11 +6482,11 @@ Function11671f: ; 11671f
 
 Function116747: ; 116747
 	ld hl, wc30e
-	ld a, [wPartyMonMenuIconAnims + 2]
+	ld a, [wc314 + 2]
 	add [hl]
 	ld [hl], a
 	ld hl, wc30f
-	ld a, [wPartyMonMenuIconAnims + 3]
+	ld a, [wc314 + 3]
 	add [hl]
 	ld [hl], a
 	ret
@@ -6518,7 +6518,7 @@ Function116758: ; 116758
 	ld a, $4
 
 .asm_11677a
-	ld [wPartyMonMenuIconAnims + 4], a
+	ld [wc314 + 4], a
 	ret
 ; 11677e
 
@@ -6526,11 +6526,11 @@ Function11677e: ; 11677e
 	ld a, $0
 
 Function116780:
-	ld hl, wPartyMonMenuIconAnims + 1
+	ld hl, wc314 + 1
 	cp [hl]
 	jr z, .asm_11678c
 	ld a, [hl]
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	scf
 	ret
 
@@ -6540,15 +6540,15 @@ Function116780:
 ; 11678e
 
 Function11678e: ; 11678e
-	ld hl, wPartyMonMenuIconAnims
+	ld hl, wc314
 	ld a, [hl]
-	ld [wPartyMonMenuIconAnims + 1], a
+	ld [wc314 + 1], a
 	inc [hl]
 	ret
 ; 116797
 
 Function116797: ; 116797
-	ld hl, wPartyMonMenuIconAnims
+	ld hl, wc314
 	inc [hl]
 	ret
 ; 11679c
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 185431a67..b869e2f8f 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -467,7 +467,7 @@ Function1183cb: ; 1183cb
 	ld [wcd66], a
 	ld [wcd67], a
 	ld [wcd68], a
-	ld [wPartyMonMenuIconAnims + 6], a
+	ld [wc314 + 6], a
 	ld [wcd89], a
 	ld [wcd8a], a
 	ld [wcd8b], a
@@ -1056,7 +1056,7 @@ Function11878d: ; 11878d (46:478d)
 	ld a, $a
 	call Function3e32
 	ld a, [wc3f0]
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld a, [wcd34]
 	ld [wcf66], a
 	ret
@@ -1100,13 +1100,13 @@ Function118805: ; 118805 (46:4805)
 	ld a, $a
 	call Function3e32
 	ld a, [wc3f0]
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld a, [wcd34]
 	ld [wcf66], a
 	ret
 
 Function118821: ; 118821 (46:4821)
-	ld a, [wPartyMonMenuIconAnims + 5]
+	ld a, [wc314 + 5]
 	cp $3
 	jr c, .asm_11884a
 	cp $4
@@ -1119,7 +1119,7 @@ Function118821: ; 118821 (46:4821)
 	ld a, $a
 	ld [wc300], a
 	ld a, [wc3f0]
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld a, [wcd34]
 	ld [wcf66], a
 	scf
@@ -1198,7 +1198,7 @@ Function118896: ; 118896
 ; 1188b0
 
 Function1188b0: ; 1188b0 (46:48b0)
-	ld de, wPartyMonMenuIconAnims + 48 + 2
+	ld de, wc314 + 48 + 2
 	ld a, $c
 	jp Function119e2b
 
@@ -1230,7 +1230,7 @@ Function1188c8: ; 1188c8 (46:48c8)
 	jp Function119e2b
 
 Function1188e7: ; 1188e7 (46:48e7)
-	ld de, wPartyMonMenuIconAnims + 48 + 2
+	ld de, wc314 + 48 + 2
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa4a]
@@ -1250,7 +1250,7 @@ Function1188e7: ; 1188e7 (46:48e7)
 
 Function118903: ; 118903 (46:4903)
 	ld a, [wc3f0]
-	ld [wPartyMonMenuIconAnims + 5], a
+	ld [wc314 + 5], a
 	ld c, $1
 	callba Function115e18
 	ld a, $8
@@ -1279,7 +1279,7 @@ Function118922: ; 118922
 	call Function119e2e
 
 Function118936:
-	ld a, [wPartyMonMenuIconAnims + 6]
+	ld a, [wc314 + 6]
 	and a
 	ret nz
 	ld hl, MenuDataHeader_119cf7
@@ -1562,7 +1562,7 @@ Function118b10:
 	jp Function119e2b
 
 Function118b24: ; 118b24 (46:4b24)
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld a, $8
 	ld [hli], a
 	ld a, $c7
@@ -1575,7 +1575,7 @@ Function118b24: ; 118b24 (46:4b24)
 	call Function119ec2
 	ld a, $80
 	ld [wcd89], a
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ret
 ; 118b42 (46:4b42)
 
@@ -1910,22 +1910,22 @@ Function118ec6: ; 118ec6
 	call Function118440
 	call SpeechTextBox
 	ld hl, $d80e
-	ld de, wPartyMonMenuIconAnims + 12
+	ld de, wc314 + 12
 	ld bc, $0026
 	call CopyBytes
 	xor a
-	ld [wPartyMonMenuIconAnims + 11], a
+	ld [wc314 + 11], a
 	ld a, $20
-	ld [wPartyMonMenuIconAnims + 7], a
+	ld [wc314 + 7], a
 	ld a, $c3
-	ld [wPartyMonMenuIconAnims + 8], a
+	ld [wc314 + 8], a
 	hlcoord 1, 14
 	ld a, l
-	ld [wPartyMonMenuIconAnims + 9], a
+	ld [wc314 + 9], a
 	ld a, h
-	ld [wPartyMonMenuIconAnims + 10], a
+	ld [wc314 + 10], a
 	ld a, $2
-	ld [wPartyMonMenuIconAnims + 6], a
+	ld [wc314 + 6], a
 	ld a, $1d
 	ld [wcd3c], a
 	ld a, $24
@@ -1998,7 +1998,7 @@ Function118f68:
 	ld a, [wcc60]
 	and a
 	jr z, .asm_118fba
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld a, $c608 % $100
 	ld [hli], a
 	ld a, $c608 / $100
@@ -2019,7 +2019,7 @@ Function118f68:
 	call Function119ec2
 	ld a, $40
 	ld [wcd89], a
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld de, $de00
 	ld bc, $0200
 	ld a, $2c
@@ -2079,7 +2079,7 @@ Function119009:
 	ld de, wcc60
 	call Function1191ad
 	ret c
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld a, $8
 	ld [hli], a
 	ld a, $c6
@@ -2100,7 +2100,7 @@ Function119009:
 	call Function119ec2
 	ld a, $40
 	ld [wcd89], a
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld de, Unkn1Pals
 	ld bc, $1000
 	ld a, $2c
@@ -2627,7 +2627,7 @@ Function1193a0:
 	ld a, $8
 	ld [wcd3c], a
 	call Function119ed8
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld a, wd000 % $100
 	ld [hli], a
 	ld a, wd000 / $100
@@ -2648,7 +2648,7 @@ Function1193a0:
 	call Function119ec2
 	ld a, $40
 	ld [wcd89], a
-	ld hl, wPartyMonMenuIconAnims + 48 + 2
+	ld hl, wc314 + 48 + 2
 	ld de, $de00
 	ld bc, $0200
 	ld a, $2c
@@ -3450,7 +3450,7 @@ Function1198ee: ; 1198ee
 	call Function119e2e
 
 Function1198f7:
-	ld a, [wPartyMonMenuIconAnims + 6]
+	ld a, [wc314 + 6]
 	and a
 	ret nz
 	ld hl, $c608 + 2
@@ -3996,7 +3996,7 @@ Function119ca2:
 	call Function119e2e
 
 Function119cab:
-	ld a, [wPartyMonMenuIconAnims + 6]
+	ld a, [wc314 + 6]
 	and a
 	ret nz
 	ld a, $80
@@ -4033,7 +4033,7 @@ Function119cc3: ; 119cc3
 	call Function119e2e
 
 Function119cdf:
-	ld a, [wPartyMonMenuIconAnims + 6]
+	ld a, [wc314 + 6]
 	and a
 	ret nz
 	ld a, $f
@@ -4479,7 +4479,7 @@ Function119f98: ; 119f98
 	ld a, $1
 	ld [wc30d], a
 	ld a, $1
-	ld [wPartyMonMenuIconAnims], a
+	ld [wc314], a
 	callba Function104061
 	and a
 	ret
@@ -4661,7 +4661,7 @@ Function11a16d: ; 11a16d
 	call Function11a63c
 	call Function11a1e6
 	hlcoord 4, 2
-	ld de, wPartyMonMenuIconAnims + 48 + 2
+	ld de, wc314 + 48 + 2
 	call PlaceString
 	call Function11a5f5
 	xor a
@@ -4715,7 +4715,7 @@ Function11a1d6: ; 11a1d6
 
 Function11a1e6: ; 11a1e6
 	ld hl, String_11a706
-	ld de, wPartyMonMenuIconAnims + 48 + 2
+	ld de, wc314 + 48 + 2
 	call Function11a1ff
 	ld hl, wcd85
 	call Function11a1ff
@@ -5541,7 +5541,7 @@ endr
 ; 11a8fa
 
 Function11a8fa: ; 11a8fa
-	ld a, [wPartyMonMenuIconAnims + 6]
+	ld a, [wc314 + 6]
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_11a909
@@ -5565,14 +5565,14 @@ Function11a90f: ; 11a90f
 	ld [rSVBK], a
 	call SpeechTextBox
 	ld a, $50
-	ld hl, wPartyMonMenuIconAnims + 12
+	ld hl, wc314 + 12
 	ld bc, $008c
 	call ByteFill
-	ld a, [wPartyMonMenuIconAnims + 7]
+	ld a, [wc314 + 7]
 	ld l, a
-	ld a, [wPartyMonMenuIconAnims + 8]
+	ld a, [wc314 + 8]
 	ld h, a
-	ld de, wPartyMonMenuIconAnims + 12
+	ld de, wc314 + 12
 .asm_11a92c
 	ld a, [hli]
 	cp $57
@@ -5603,17 +5603,17 @@ Function11a90f: ; 11a90f
 
 .asm_11a94f
 	xor a
-	ld [wPartyMonMenuIconAnims + 11], a
+	ld [wc314 + 11], a
 	ld a, $20
-	ld [wPartyMonMenuIconAnims + 7], a
+	ld [wc314 + 7], a
 	ld a, $c3
-	ld [wPartyMonMenuIconAnims + 8], a
+	ld [wc314 + 8], a
 	hlcoord 1, 14
 	ld a, l
-	ld [wPartyMonMenuIconAnims + 9], a
+	ld [wc314 + 9], a
 	ld a, h
-	ld [wPartyMonMenuIconAnims + 10], a
-	ld hl, wPartyMonMenuIconAnims + 6
+	ld [wc314 + 10], a
+	ld hl, wc314 + 6
 	inc [hl]
 	ld a, $3
 	ld [rSVBK], a
@@ -5623,7 +5623,7 @@ Function11a970:
 ; 11a971
 
 Function11a971: ; 11a971
-	ld hl, wPartyMonMenuIconAnims + 11
+	ld hl, wc314 + 11
 	ld a, [hJoyDown]
 	and a
 	jr nz, .asm_11a97f
@@ -5638,34 +5638,34 @@ Function11a971: ; 11a971
 	and $7
 	ld [hl], a
 	ld hl, wcd8d
-	ld a, [wPartyMonMenuIconAnims + 7]
+	ld a, [wc314 + 7]
 	ld e, a
-	ld a, [wPartyMonMenuIconAnims + 8]
+	ld a, [wc314 + 8]
 	ld d, a
 	ld a, [de]
 	inc de
 	ld [hli], a
 	ld a, e
-	ld [wPartyMonMenuIconAnims + 7], a
+	ld [wc314 + 7], a
 	ld a, d
-	ld [wPartyMonMenuIconAnims + 8], a
+	ld [wc314 + 8], a
 	ld a, $50
 	ld [hl], a
-	ld a, [wPartyMonMenuIconAnims + 9]
+	ld a, [wc314 + 9]
 	ld l, a
-	ld a, [wPartyMonMenuIconAnims + 10]
+	ld a, [wc314 + 10]
 	ld h, a
 	ld de, wcd8d
 	call PlaceString
 	ld a, c
-	ld [wPartyMonMenuIconAnims + 9], a
+	ld [wc314 + 9], a
 	ld a, b
-	ld [wPartyMonMenuIconAnims + 10], a
+	ld [wc314 + 10], a
 	ld a, [wcd8d]
 	cp $50
 	jr nz, .asm_11a9bf
 	xor a
-	ld [wPartyMonMenuIconAnims + 6], a
+	ld [wc314 + 6], a
 
 .asm_11a9bf
 	ret
@@ -5673,11 +5673,11 @@ Function11a971: ; 11a971
 
 Function11a9c0: ; 11a9c0
 	ld a, l
-	ld [wPartyMonMenuIconAnims + 7], a
+	ld [wc314 + 7], a
 	ld a, h
-	ld [wPartyMonMenuIconAnims + 8], a
+	ld [wc314 + 8], a
 	ld a, $1
-	ld [wPartyMonMenuIconAnims + 6], a
+	ld [wc314 + 6], a
 	ret
 ; 11a9ce