diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_40.asm | 10 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 194 |
2 files changed, 102 insertions, 102 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index affe094a0..ae62b5622 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -173,7 +173,7 @@ Function1000fa: ; 1000fa xor a ld [InLinkBattle], a ld a, $4 - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a callba Function11619d ld hl, wcd29 set 6, [hl] @@ -4356,7 +4356,7 @@ Function101cc2: ; 101cc2 ; unreferenced Function101cc8: ; 101cc8 ld a, $1 - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ld a, $1 ld [wc30d], a ld hl, wcd29 @@ -4369,7 +4369,7 @@ Function101cc8: ; 101cc8 Function101cdf: ; 101cdf ld a, $6 - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ld a, $1 ld [wc30d], a ld hl, wcd29 @@ -4382,7 +4382,7 @@ Function101cdf: ; 101cdf Function101cf6: ; 101cf6 ld a, $b - ld [wPartyMon1MenuIconAnim + 1], a + ld [wPartyMonMenuIconAnims + 1], a ld a, [wcd25] inc a ld [wcd25], a @@ -4391,7 +4391,7 @@ Function101cf6: ; 101cf6 Function101d03: ; 101d03 ld a, $e - ld [wPartyMon1MenuIconAnim + 1], a + ld [wPartyMonMenuIconAnims + 1], a ld a, [wcd25] inc a ld [wcd25], a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index ded844c5e..331935802 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 [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld [wc310], a ld [wc311], a ld [wc312], a ld [wc313], a - ld [wPartyMon1MenuIconAnim], a - ld [wPartyMon1MenuIconAnim + 1], a - ld [wPartyMon1MenuIconAnim + 4], a + ld [wPartyMonMenuIconAnims], a + ld [wPartyMonMenuIconAnims + 1], a + ld [wPartyMonMenuIconAnims + 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, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 5] cp $2 jr c, .asm_1161b4 ld a, $a0 @@ -5631,7 +5631,7 @@ Function11619d: ; 11619d ; 1161b8 Function1161b8: ; 1161b8 - ld a, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 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, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 5] inc a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ret ; 11628c @@ -5774,15 +5774,15 @@ MenuDataHeader_11628c: ; 11628c Function116294: ; 116294 callba Function170d02 - ld a, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 5] inc a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld a, [rSVBK] push af ld a, $5 ld [rSVBK], a ld hl, wd030 - ld de, wPartyMon1MenuIconAnim + 12 + ld de, wPartyMonMenuIconAnims + 12 ld bc, $0010 call CopyBytes ld hl, Palette_11734e @@ -5799,9 +5799,9 @@ Function116294: ; 116294 Function1162cb: ; 1162cb callba Function170cc6 - ld a, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 5] inc a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 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, [wPartyMon1MenuIconAnim + 4] + ld a, [wPartyMonMenuIconAnims + 4] ld e, a ld a, [hli] sub e @@ -5939,7 +5939,7 @@ Function11636e: ; 11636e xor a ld [wc2aa], a xor a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld [wc30d], a ret ; 1163c0 @@ -5961,7 +5961,7 @@ Function1163c0: ; 1163c0 push af ld a, $5 ld [rSVBK], a - ld hl, wPartyMon1MenuIconAnim + 12 + ld hl, wPartyMonMenuIconAnims + 12 ld de, wd030 ld bc, $0010 call CopyBytes @@ -5997,7 +5997,7 @@ Function1163c0: ; 1163c0 .asm_116439 xor a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld [wc30d], a ret ; 116441 @@ -6014,14 +6014,14 @@ Function116441: ; 116441 xor a ld [wc2aa], a xor a - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld [wc30d], a ret ; 116468 Function116468: ; 116468 call Function116567 - ld a, [wPartyMon1MenuIconAnim] + ld a, [wPartyMonMenuIconAnims] cp $d jr nz, .asm_1164a8 ld hl, wc30e @@ -6213,7 +6213,7 @@ Function116567: ; 116567 ; 11659d Function11659d: ; 11659d - ld a, [wPartyMon1MenuIconAnim] + ld a, [wPartyMonMenuIconAnims] cp $12 ret nc ld e, a @@ -6289,7 +6289,7 @@ Function116600: call Function116780 ret c ld a, $2 - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ret ; 116615 @@ -6332,24 +6332,24 @@ Function116640: call Function116780 ret c ld a, $7 - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ret ; 116655 Function116655: ; 116655 xor a - ld [wPartyMon1MenuIconAnim + 3], a + ld [wPartyMonMenuIconAnims + 3], a call Function11678e Function11665c: - ld hl, wPartyMon1MenuIconAnim + 3 + ld hl, wPartyMonMenuIconAnims + 3 ld a, $1 xor [hl] ld [hl], a add $4 ld c, a call Function11679c - ld a, [wPartyMon1MenuIconAnim + 3] + ld a, [wPartyMonMenuIconAnims + 3] and a jr nz, .asm_116673 ld a, $48 @@ -6378,7 +6378,7 @@ Function11668d: call Function116780 ret c ld a, $c - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ret ; 11669f @@ -6393,9 +6393,9 @@ Function1166a2: ld [wc30f], a ld [wc3f3], a ld a, $ff - ld [wPartyMon1MenuIconAnim + 2], a + ld [wPartyMonMenuIconAnims + 2], a xor a - ld [wPartyMon1MenuIconAnim + 3], a + ld [wPartyMonMenuIconAnims + 3], a ld a, $0 ld c, a call Function11679c @@ -6417,25 +6417,25 @@ Function1166d6: cp $48 jr nz, .asm_1166e4 xor a - ld [wPartyMon1MenuIconAnim + 2], a + ld [wPartyMonMenuIconAnims + 2], a .asm_1166e4 ld a, [wc311] cp $ff ret nz ld a, $4 - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a xor a - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a ret ; 1166f4 Function1166f4: ; 1166f4 ld [wc30e], a ld a, b - ld [wPartyMon1MenuIconAnim + 2], a + ld [wPartyMonMenuIconAnims + 2], a xor a - ld [wPartyMon1MenuIconAnim + 3], a + ld [wPartyMonMenuIconAnims + 3], a ld hl, wc30f .asm_116702 call Random @@ -6460,9 +6460,9 @@ Function1166f4: ; 1166f4 Function11671f: ; 11671f ld [wc30f], a ld a, b - ld [wPartyMon1MenuIconAnim + 3], a + ld [wPartyMonMenuIconAnims + 3], a xor a - ld [wPartyMon1MenuIconAnim + 2], a + ld [wPartyMonMenuIconAnims + 2], a ld hl, wc30e .asm_11672d call Random @@ -6482,11 +6482,11 @@ Function11671f: ; 11671f Function116747: ; 116747 ld hl, wc30e - ld a, [wPartyMon1MenuIconAnim + 2] + ld a, [wPartyMonMenuIconAnims + 2] add [hl] ld [hl], a ld hl, wc30f - ld a, [wPartyMon1MenuIconAnim + 3] + ld a, [wPartyMonMenuIconAnims + 3] add [hl] ld [hl], a ret @@ -6518,7 +6518,7 @@ Function116758: ; 116758 ld a, $4 .asm_11677a - ld [wPartyMon1MenuIconAnim + 4], a + ld [wPartyMonMenuIconAnims + 4], a ret ; 11677e @@ -6526,11 +6526,11 @@ Function11677e: ; 11677e ld a, $0 Function116780: - ld hl, wPartyMon1MenuIconAnim + 1 + ld hl, wPartyMonMenuIconAnims + 1 cp [hl] jr z, .asm_11678c ld a, [hl] - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a scf ret @@ -6540,15 +6540,15 @@ Function116780: ; 11678e Function11678e: ; 11678e - ld hl, wPartyMon1MenuIconAnim + ld hl, wPartyMonMenuIconAnims ld a, [hl] - ld [wPartyMon1MenuIconAnim + 1], a + ld [wPartyMonMenuIconAnims + 1], a inc [hl] ret ; 116797 Function116797: ; 116797 - ld hl, wPartyMon1MenuIconAnim + ld hl, wPartyMonMenuIconAnims inc [hl] ret ; 11679c @@ -8938,7 +8938,7 @@ Function1183cb: ; 1183cb ld [wcd66], a ld [wcd67], a ld [wcd68], a - ld [wPartyMon1MenuIconAnim + 6], a + ld [wPartyMonMenuIconAnims + 6], a ld [wcd89], a ld [wcd8a], a ld [wcd8b], a @@ -9527,7 +9527,7 @@ Function11878d: ; 11878d (46:478d) ld a, $a call Function3e32 ld a, [wc3f0] - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld a, [wcd34] ld [wcf66], a ret @@ -9571,13 +9571,13 @@ Function118805: ; 118805 (46:4805) ld a, $a call Function3e32 ld a, [wc3f0] - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld a, [wcd34] ld [wcf66], a ret Function118821: ; 118821 (46:4821) - ld a, [wPartyMon1MenuIconAnim + 5] + ld a, [wPartyMonMenuIconAnims + 5] cp $3 jr c, .asm_11884a cp $4 @@ -9590,7 +9590,7 @@ Function118821: ; 118821 (46:4821) ld a, $a ld [wc300], a ld a, [wc3f0] - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld a, [wcd34] ld [wcf66], a scf @@ -9669,7 +9669,7 @@ Function118896: ; 118896 ; 1188b0 Function1188b0: ; 1188b0 (46:48b0) - ld de, wPartyMon4MenuIconAnim + 2 + ld de, wPartyMonMenuIconAnims + 48 + 2 ld a, $c jp Function119e2b @@ -9701,7 +9701,7 @@ Function1188c8: ; 1188c8 (46:48c8) jp Function119e2b Function1188e7: ; 1188e7 (46:48e7) - ld de, wPartyMon4MenuIconAnim + 2 + ld de, wPartyMonMenuIconAnims + 48 + 2 ld a, $5 call GetSRAMBank ld a, [$aa4a] @@ -9721,7 +9721,7 @@ Function1188e7: ; 1188e7 (46:48e7) Function118903: ; 118903 (46:4903) ld a, [wc3f0] - ld [wPartyMon1MenuIconAnim + 5], a + ld [wPartyMonMenuIconAnims + 5], a ld c, $1 callba Function115e18 ld a, $8 @@ -9750,7 +9750,7 @@ Function118922: ; 118922 call Function119e2e Function118936: - ld a, [wPartyMon1MenuIconAnim + 6] + ld a, [wPartyMonMenuIconAnims + 6] and a ret nz ld hl, MenuDataHeader_119cf7 @@ -10032,7 +10032,7 @@ Function118b10: jp Function119e2b Function118b24: ; 118b24 (46:4b24) - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld a, $8 ld [hli], a ld a, $c7 @@ -10045,7 +10045,7 @@ Function118b24: ; 118b24 (46:4b24) call Function119ec2 ld a, $80 ld [wcd89], a - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ret ; 118b42 (46:4b42) @@ -10380,22 +10380,22 @@ Function118ec6: ; 118ec6 call Function118440 call SpeechTextBox ld hl, $d80e - ld de, wPartyMon1MenuIconAnim + 12 + ld de, wPartyMonMenuIconAnims + 12 ld bc, $0026 call CopyBytes xor a - ld [wPartyMon1MenuIconAnim + 11], a + ld [wPartyMonMenuIconAnims + 11], a ld a, $20 - ld [wPartyMon1MenuIconAnim + 7], a + ld [wPartyMonMenuIconAnims + 7], a ld a, $c3 - ld [wPartyMon1MenuIconAnim + 8], a + ld [wPartyMonMenuIconAnims + 8], a hlcoord 1, 14 ld a, l - ld [wPartyMon1MenuIconAnim + 9], a + ld [wPartyMonMenuIconAnims + 9], a ld a, h - ld [wPartyMon1MenuIconAnim + 10], a + ld [wPartyMonMenuIconAnims + 10], a ld a, $2 - ld [wPartyMon1MenuIconAnim + 6], a + ld [wPartyMonMenuIconAnims + 6], a ld a, $1d ld [wcd3c], a ld a, $24 @@ -10468,7 +10468,7 @@ Function118f68: ld a, [wcc60] and a jr z, .asm_118fba - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld a, $c608 % $100 ld [hli], a ld a, $c608 / $100 @@ -10489,7 +10489,7 @@ Function118f68: call Function119ec2 ld a, $40 ld [wcd89], a - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld de, $de00 ld bc, $0200 ld a, $2c @@ -10549,7 +10549,7 @@ Function119009: ld de, wcc60 call Function1191ad ret c - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld a, $8 ld [hli], a ld a, $c6 @@ -10570,7 +10570,7 @@ Function119009: call Function119ec2 ld a, $40 ld [wcd89], a - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld de, Unkn1Pals ld bc, $1000 ld a, $2c @@ -11097,7 +11097,7 @@ Function1193a0: ld a, $8 ld [wcd3c], a call Function119ed8 - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld a, wd000 % $100 ld [hli], a ld a, wd000 / $100 @@ -11118,7 +11118,7 @@ Function1193a0: call Function119ec2 ld a, $40 ld [wcd89], a - ld hl, wPartyMon4MenuIconAnim + 2 + ld hl, wPartyMonMenuIconAnims + 48 + 2 ld de, $de00 ld bc, $0200 ld a, $2c @@ -11920,7 +11920,7 @@ Function1198ee: ; 1198ee call Function119e2e Function1198f7: - ld a, [wPartyMon1MenuIconAnim + 6] + ld a, [wPartyMonMenuIconAnims + 6] and a ret nz ld hl, $c608 + 2 @@ -12466,7 +12466,7 @@ Function119ca2: call Function119e2e Function119cab: - ld a, [wPartyMon1MenuIconAnim + 6] + ld a, [wPartyMonMenuIconAnims + 6] and a ret nz ld a, $80 @@ -12503,7 +12503,7 @@ Function119cc3: ; 119cc3 call Function119e2e Function119cdf: - ld a, [wPartyMon1MenuIconAnim + 6] + ld a, [wPartyMonMenuIconAnims + 6] and a ret nz ld a, $f @@ -12949,7 +12949,7 @@ Function119f98: ; 119f98 ld a, $1 ld [wc30d], a ld a, $1 - ld [wPartyMon1MenuIconAnim], a + ld [wPartyMonMenuIconAnims], a callba Function104061 and a ret @@ -13131,7 +13131,7 @@ Function11a16d: ; 11a16d call Function11a63c call Function11a1e6 hlcoord 4, 2 - ld de, wPartyMon4MenuIconAnim + 2 + ld de, wPartyMonMenuIconAnims + 48 + 2 call PlaceString call Function11a5f5 xor a @@ -13185,7 +13185,7 @@ Function11a1d6: ; 11a1d6 Function11a1e6: ; 11a1e6 ld hl, String_11a706 - ld de, wPartyMon4MenuIconAnim + 2 + ld de, wPartyMonMenuIconAnims + 48 + 2 call Function11a1ff ld hl, wcd85 call Function11a1ff @@ -14011,7 +14011,7 @@ endr ; 11a8fa Function11a8fa: ; 11a8fa - ld a, [wPartyMon1MenuIconAnim + 6] + ld a, [wPartyMonMenuIconAnims + 6] ld e, a ld d, 0 ld hl, Jumptable_11a909 @@ -14035,14 +14035,14 @@ Function11a90f: ; 11a90f ld [rSVBK], a call SpeechTextBox ld a, $50 - ld hl, wPartyMon1MenuIconAnim + 12 + ld hl, wPartyMonMenuIconAnims + 12 ld bc, $008c call ByteFill - ld a, [wPartyMon1MenuIconAnim + 7] + ld a, [wPartyMonMenuIconAnims + 7] ld l, a - ld a, [wPartyMon1MenuIconAnim + 8] + ld a, [wPartyMonMenuIconAnims + 8] ld h, a - ld de, wPartyMon1MenuIconAnim + 12 + ld de, wPartyMonMenuIconAnims + 12 .asm_11a92c ld a, [hli] cp $57 @@ -14073,17 +14073,17 @@ Function11a90f: ; 11a90f .asm_11a94f xor a - ld [wPartyMon1MenuIconAnim + 11], a + ld [wPartyMonMenuIconAnims + 11], a ld a, $20 - ld [wPartyMon1MenuIconAnim + 7], a + ld [wPartyMonMenuIconAnims + 7], a ld a, $c3 - ld [wPartyMon1MenuIconAnim + 8], a + ld [wPartyMonMenuIconAnims + 8], a hlcoord 1, 14 ld a, l - ld [wPartyMon1MenuIconAnim + 9], a + ld [wPartyMonMenuIconAnims + 9], a ld a, h - ld [wPartyMon1MenuIconAnim + 10], a - ld hl, wPartyMon1MenuIconAnim + 6 + ld [wPartyMonMenuIconAnims + 10], a + ld hl, wPartyMonMenuIconAnims + 6 inc [hl] ld a, $3 ld [rSVBK], a @@ -14093,7 +14093,7 @@ Function11a970: ; 11a971 Function11a971: ; 11a971 - ld hl, wPartyMon1MenuIconAnim + 11 + ld hl, wPartyMonMenuIconAnims + 11 ld a, [hJoyDown] and a jr nz, .asm_11a97f @@ -14108,34 +14108,34 @@ Function11a971: ; 11a971 and $7 ld [hl], a ld hl, wcd8d - ld a, [wPartyMon1MenuIconAnim + 7] + ld a, [wPartyMonMenuIconAnims + 7] ld e, a - ld a, [wPartyMon1MenuIconAnim + 8] + ld a, [wPartyMonMenuIconAnims + 8] ld d, a ld a, [de] inc de ld [hli], a ld a, e - ld [wPartyMon1MenuIconAnim + 7], a + ld [wPartyMonMenuIconAnims + 7], a ld a, d - ld [wPartyMon1MenuIconAnim + 8], a + ld [wPartyMonMenuIconAnims + 8], a ld a, $50 ld [hl], a - ld a, [wPartyMon1MenuIconAnim + 9] + ld a, [wPartyMonMenuIconAnims + 9] ld l, a - ld a, [wPartyMon1MenuIconAnim + 10] + ld a, [wPartyMonMenuIconAnims + 10] ld h, a ld de, wcd8d call PlaceString ld a, c - ld [wPartyMon1MenuIconAnim + 9], a + ld [wPartyMonMenuIconAnims + 9], a ld a, b - ld [wPartyMon1MenuIconAnim + 10], a + ld [wPartyMonMenuIconAnims + 10], a ld a, [wcd8d] cp $50 jr nz, .asm_11a9bf xor a - ld [wPartyMon1MenuIconAnim + 6], a + ld [wPartyMonMenuIconAnims + 6], a .asm_11a9bf ret @@ -14143,11 +14143,11 @@ Function11a971: ; 11a971 Function11a9c0: ; 11a9c0 ld a, l - ld [wPartyMon1MenuIconAnim + 7], a + ld [wPartyMonMenuIconAnims + 7], a ld a, h - ld [wPartyMon1MenuIconAnim + 8], a + ld [wPartyMonMenuIconAnims + 8], a ld a, $1 - ld [wPartyMon1MenuIconAnim + 6], a + ld [wPartyMonMenuIconAnims + 6], a ret ; 11a9ce |