summaryrefslogtreecommitdiff
path: root/engine/battle_anims/functions.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle_anims/functions.asm')
-rw-r--r--engine/battle_anims/functions.asm456
1 files changed, 222 insertions, 234 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index e0eedec86..d631ca72f 100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -1,4 +1,4 @@
-DoBattleAnimFrame: ; ccfbe
+DoBattleAnimFrame:
ld hl, BATTLEANIMSTRUCT_FUNCTION
add hl, bc
ld e, [hl]
@@ -10,7 +10,6 @@ DoBattleAnimFrame: ; ccfbe
ld h, [hl]
ld l, a
jp hl
-; ccfce
.Jumptable:
; entries correspond to BATTLEANIMFUNC_* constants
@@ -95,7 +94,7 @@ DoBattleAnimFrame: ; ccfbe
dw BattleAnimFunction_4E ; 4e
dw BattleAnimFunction_4F ; 4f
-BattleAnimFunction_Null: ; cd06e (33:506e)
+BattleAnimFunction_Null:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -105,13 +104,13 @@ BattleAnimFunction_Null: ; cd06e (33:506e)
.zero
ret
-BattleAnimFunction_ThrowFromPlayerToEnemyAndDisappear: ; cd079 (33:5079)
+BattleAnimFunction_ThrowFromPlayerToEnemyAndDisappear:
call BattleAnimFunction_ThrowFromPlayerToEnemy
ret c
call DeinitBattleAnimation
ret
-BattleAnimFunction_ThrowFromPlayerToEnemy: ; cd081 (33:5081)
+BattleAnimFunction_ThrowFromPlayerToEnemy:
; If x coord at $88 or beyond, abort.
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -143,7 +142,7 @@ BattleAnimFunction_ThrowFromPlayerToEnemy: ; cd081 (33:5081)
scf
ret
-BattleAnimFunction_04: ; cd0a6 (33:50a6)
+BattleAnimFunction_04:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -184,7 +183,7 @@ BattleAnimFunction_04: ; cd0a6 (33:50a6)
ld [hl], a
ret
-BattleAnimFunction_03: ; cd0e3 (33:50e3)
+BattleAnimFunction_03:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -230,7 +229,7 @@ BattleAnimFunction_03: ; cd0e3 (33:50e3)
inc [hl]
ret
-BattleAnimFunction_01: ; cd12a (33:512a)
+BattleAnimFunction_01:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -251,7 +250,7 @@ BattleAnimFunction_01: ; cd12a (33:512a)
call Functionce70a
ret
-BattleAnimFunction_02: ; cd146 (33:5146)
+BattleAnimFunction_02:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -267,7 +266,7 @@ BattleAnimFunction_02: ; cd146 (33:5146)
call DeinitBattleAnimation
ret
-BattleAnimFunction_PokeBall: ; cd15c (33:515c)
+BattleAnimFunction_PokeBall:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -384,7 +383,7 @@ BattleAnimFunction_PokeBall: ; cd15c (33:515c)
call DeinitBattleAnimation
ret
-BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
+BattleAnimFunction_PokeBallBlocked:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -424,7 +423,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
call DeinitBattleAnimation
ret
-GetBallAnimPal: ; cd249 (33:5249)
+GetBallAnimPal:
ld hl, BallColors
ld a, [rSVBK]
push af
@@ -449,11 +448,10 @@ GetBallAnimPal: ; cd249 (33:5249)
add hl, bc
ld [hl], a
ret
-; cd26c (33:526c)
INCLUDE "data/battle_anims/ball_colors.asm"
-BattleAnimFunction_10: ; cd284 (33:5284)
+BattleAnimFunction_10:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -495,7 +493,7 @@ BattleAnimFunction_10: ; cd284 (33:5284)
.four
ret
-BattleAnimFunction_07: ; cd2be (33:52be)
+BattleAnimFunction_07:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -542,7 +540,7 @@ BattleAnimFunction_07: ; cd2be (33:52be)
call DeinitBattleAnimation
ret
-BattleAnimFunction_08: ; cd306 (33:5306)
+BattleAnimFunction_08:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -654,7 +652,7 @@ BattleAnimFunction_08: ; cd306 (33:5306)
jr nz, .loop
ret
-BattleAnimFunction_09: ; cd3ae (33:53ae)
+BattleAnimFunction_09:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -702,7 +700,7 @@ BattleAnimFunction_09: ; cd3ae (33:53ae)
call DeinitBattleAnimation
ret
-BattleAnimFunction_0A: ; cd3f2 (33:53f2)
+BattleAnimFunction_0A:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -798,7 +796,7 @@ BattleAnimFunction_0A: ; cd3f2 (33:53f2)
.six
ret
-BattleAnimFunction_RazorLeaf: ; cd478 (33:5478)
+BattleAnimFunction_RazorLeaf:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -945,7 +943,7 @@ BattleAnimFunction_RazorLeaf: ; cd478 (33:5478)
call Functionce70a
ret
-Functioncd557: ; cd557 (33:5557)
+Functioncd557:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -983,7 +981,7 @@ Functioncd557: ; cd557 (33:5557)
ld de, -$100
ret
-BattleAnimFunction_4E: ; cd58a (33:558a)
+BattleAnimFunction_4E:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -1045,7 +1043,7 @@ BattleAnimFunction_4E: ; cd58a (33:558a)
ld [hl], e
ret
-BattleAnimFunction_0C: ; cd5e9 (33:55e9)
+BattleAnimFunction_0C:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -1129,7 +1127,7 @@ BattleAnimFunction_0C: ; cd5e9 (33:55e9)
ld [hl], d
ret
-BattleAnimFunction_0D: ; cd66a (33:566a)
+BattleAnimFunction_0D:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
@@ -1205,7 +1203,7 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
call DeinitBattleAnimation
ret
-asm_cd6da: ; cd6da (33:56da)
+asm_cd6da:
inc a
inc a
ld [hl], a
@@ -1214,13 +1212,13 @@ asm_cd6da: ; cd6da (33:56da)
ld [hLYOverrideStart], a
ret
-BattleAnimFunction_0E: ; cd6e3 (33:56e3)
+BattleAnimFunction_0E:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd6ea
dw Functioncd6f7
-Functioncd6ea: ; cd6ea (33:56ea)
+Functioncd6ea:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -1228,7 +1226,7 @@ Functioncd6ea: ; cd6ea (33:56ea)
add [hl] ; offset
call ReinitBattleAnimFrameset
-Functioncd6f7: ; cd6f7 (33:56f7)
+Functioncd6f7:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1251,7 +1249,7 @@ Functioncd6f7: ; cd6f7 (33:56f7)
ld [hl], a
ret
-BattleAnimFunction_0F: ; cd71a (33:571a)
+BattleAnimFunction_0F:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd725
@@ -1259,9 +1257,9 @@ BattleAnimFunction_0F: ; cd71a (33:571a)
dw Functioncd763
dw Functioncd776
-Functioncd725: ; cd725 (33:5725)
+Functioncd725:
call BattleAnim_IncAnonJumptableIndex
-Functioncd728: ; cd728 (33:5728)
+Functioncd728:
ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
@@ -1295,7 +1293,7 @@ Functioncd728: ; cd728 (33:5728)
ld a, [hl]
and $1
ld [hl], a
-Functioncd763: ; cd763 (33:5763)
+Functioncd763:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -1308,10 +1306,10 @@ Functioncd763: ; cd763 (33:5763)
call BattleAnim_IncAnonJumptableIndex
ld a, BATTLEANIMFRAMESET_29
call ReinitBattleAnimFrameset
-Functioncd776: ; cd776 (33:5776)
+Functioncd776:
ret
-BattleAnimFunction_11: ; cd777 (33:5777)
+BattleAnimFunction_11:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -1343,13 +1341,13 @@ BattleAnimFunction_11: ; cd777 (33:5777)
ld [hl], a
ret
-BattleAnimFunction_14: ; cd7a4 (33:57a4)
+BattleAnimFunction_14:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd7ab
dw Functioncd7d2
-Functioncd7ab: ; cd7ab (33:57ab)
+Functioncd7ab:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -1371,7 +1369,7 @@ Functioncd7ab: ; cd7ab (33:57ab)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $1
-Functioncd7d2: ; cd7d2 (33:57d2)
+Functioncd7d2:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -1411,7 +1409,7 @@ Functioncd7d2: ; cd7d2 (33:57d2)
dec [hl]
ret
-BattleAnimFunction_15: ; cd80c (33:580c)
+BattleAnimFunction_15:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd81f
@@ -1419,18 +1417,18 @@ BattleAnimFunction_15: ; cd80c (33:580c)
dw Functioncd81f
dw Functioncd820
-Functioncd817: ; cd817 (33:5817)
+Functioncd817:
call BattleAnim_IncAnonJumptableIndex
ld a, BATTLEANIMFRAMESET_35
call ReinitBattleAnimFrameset
-Functioncd81f: ; cd81f (33:581f)
+Functioncd81f:
ret
-Functioncd820: ; cd820 (33:5820)
+Functioncd820:
call DeinitBattleAnimation
ret
-BattleAnimFunction_16: ; cd824 (33:5824)
+BattleAnimFunction_16:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd835
@@ -1441,7 +1439,7 @@ BattleAnimFunction_16: ; cd824 (33:5824)
dw Functioncd88f
dw Functioncd893
-Functioncd835: ; cd835 (33:5835)
+Functioncd835:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
@@ -1468,7 +1466,7 @@ Functioncd835: ; cd835 (33:5835)
ld a, [hl]
and $7f
ld [hl], a
-Functioncd860: ; cd860 (33:5860)
+Functioncd860:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -1499,17 +1497,17 @@ Functioncd860: ; cd860 (33:5860)
ld a, [hl]
and $1f
ret nz
-Functioncd88f: ; cd88f (33:588f)
+Functioncd88f:
call BattleAnim_IncAnonJumptableIndex
ret
-Functioncd893: ; cd893 (33:5893)
+Functioncd893:
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
add hl, bc
ld [hl], $1
ret
-BattleAnimFunction_17: ; cd89a (33:589a)
+BattleAnimFunction_17:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd8ab
@@ -1520,7 +1518,7 @@ BattleAnimFunction_17: ; cd89a (33:589a)
dw Functioncd8f5
dw Functioncd8f9
-Functioncd8ab: ; cd8ab (33:58ab)
+Functioncd8ab:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -1542,7 +1540,7 @@ Functioncd8ab: ; cd8ab (33:58ab)
and $7f
ld [hl], a
-Functioncd8cc: ; cd8cc (33:58cc)
+Functioncd8cc:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -1570,30 +1568,30 @@ Functioncd8cc: ; cd8cc (33:58cc)
and $1f
ret nz
-Functioncd8f5: ; cd8f5 (33:58f5)
+Functioncd8f5:
call BattleAnim_IncAnonJumptableIndex
ret
-Functioncd8f9: ; cd8f9 (33:58f9)
+Functioncd8f9:
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
add hl, bc
ld [hl], $1
ret
-BattleAnimFunction_18: ; cd900 (33:5900)
+BattleAnimFunction_18:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd907
dw Functioncd913
-Functioncd907: ; cd907 (33:5907)
+Functioncd907:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
inc hl
ld [hl], $0
-Functioncd913: ; cd913 (33:5913)
+Functioncd913:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -1637,7 +1635,7 @@ Functioncd913: ; cd913 (33:5913)
call DeinitBattleAnimation
ret
-BattleAnimFunction_19: ; cd954 (33:5954)
+BattleAnimFunction_19:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncd961
@@ -1646,16 +1644,16 @@ BattleAnimFunction_19: ; cd954 (33:5954)
dw Functioncd96a
dw Functioncd97b
-Functioncd961: ; cd961 (33:5961)
+Functioncd961:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $0
-Functioncd96a: ; cd96a (33:596a)
+Functioncd96a:
call Functioncd99a
ret
-Functioncd96e: ; cd96e (33:596e)
+Functioncd96e:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1664,7 +1662,7 @@ Functioncd96e: ; cd96e (33:596e)
call BattleAnim_IncAnonJumptableIndex
ret
-Functioncd97b: ; cd97b (33:597b)
+Functioncd97b:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1673,7 +1671,7 @@ Functioncd97b: ; cd97b (33:597b)
call DeinitBattleAnimation
ret
-asm_cd988: ; cd988 (33:5988)
+asm_cd988:
call Functioncd99a
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -1686,7 +1684,7 @@ asm_cd988: ; cd988 (33:5988)
dec [hl]
ret
-Functioncd99a: ; cd99a (33:599a)
+Functioncd99a:
call Functioncd9f4
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -1746,7 +1744,7 @@ Functioncd99a: ; cd99a (33:599a)
ld [hl], a
ret
-Functioncd9f4: ; cd9f4 (33:59f4)
+Functioncd9f4:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld e, [hl]
@@ -1756,12 +1754,10 @@ Functioncd9f4: ; cd9f4 (33:59f4)
ld d, [hl]
ret
-; cda01 (33:5a01)
-Unknown_cda01: ; cda01
+Unknown_cda01:
db 8, 6, 5, 4, 5, 6, 8, 12, 16
-; cda0a
-BattleAnimFunction_1C: ; cda0a (33:5a0a)
+BattleAnimFunction_1C:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1790,14 +1786,14 @@ BattleAnimFunction_1C: ; cda0a (33:5a0a)
jr nz, .asm_cda2c
ret
-BattleAnimFunction_1F: ; cda31 (33:5a31)
+BattleAnimFunction_1F:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncda4c
dw Functioncda3a
dw Functioncda4c
-Functioncda3a: ; cda3a (33:5a3a)
+Functioncda3a:
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld a, [hl]
@@ -1807,24 +1803,24 @@ Functioncda3a: ; cda3a (33:5a3a)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $8
-Functioncda4c: ; cda4c (33:5a4c)
+Functioncda4c:
ret
-BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
+BattleAnimFunction_LeechSeed:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
dw .one
dw .two
dw .three
-.zero: ; cda58 (33:5a58)
+.zero:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $40
ret
-.one: ; cda62 (33:5a62)
+.one:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -1840,7 +1836,7 @@ BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
call BattleAnim_IncAnonJumptableIndex
ret
-.two: ; cda7a (33:5a7a)
+.two:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -1853,10 +1849,10 @@ BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
call BattleAnim_IncAnonJumptableIndex
ld a, BATTLEANIMFRAMESET_58
call ReinitBattleAnimFrameset
-.three: ; cda8c (33:5a8c)
+.three:
ret
-Functioncda8d: ; cda8d (33:5a8d)
+Functioncda8d:
dec [hl]
ld d, $20
call BattleAnim_Sine
@@ -1904,21 +1900,21 @@ Functioncda8d: ; cda8d (33:5a8d)
dec [hl]
ret
-BattleAnimFunction_3F: ; cdad6 (33:5ad6)
+BattleAnimFunction_3F:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdadf
dw Functioncdae9
dw Functioncdaf9
-Functioncdadf: ; cdadf (33:5adf)
+Functioncdadf:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $40
ret
-Functioncdae9: ; cdae9 (33:5ae9)
+Functioncdae9:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -1929,10 +1925,10 @@ Functioncdae9: ; cdae9 (33:5ae9)
.asm_cdaf6
call BattleAnim_IncAnonJumptableIndex
-Functioncdaf9: ; cdaf9 (33:5af9)
+Functioncdaf9:
ret
-BattleAnimFunction_1A: ; cdafa (33:5afa)
+BattleAnimFunction_1A:
call BattleAnimFunction_03
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -1941,7 +1937,7 @@ BattleAnimFunction_1A: ; cdafa (33:5afa)
ld [hl], a
ret
-BattleAnimFunction_1B: ; cdb06 (33:5b06)
+BattleAnimFunction_1B:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdb13
@@ -1950,10 +1946,10 @@ BattleAnimFunction_1B: ; cdb06 (33:5b06)
dw Functioncdb50
dw Functioncdb65
-Functioncdb13: ; cdb13 (33:5b13)
+Functioncdb13:
ret
-Functioncdb14: ; cdb14 (33:5b14)
+Functioncdb14:
ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
@@ -1969,7 +1965,7 @@ Functioncdb14: ; cdb14 (33:5b14)
ld [hl], a
ret
-Functioncdb28: ; cdb28 (33:5b28)
+Functioncdb28:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1994,7 +1990,7 @@ Functioncdb28: ; cdb28 (33:5b28)
dec [hl]
ret
-Functioncdb50: ; cdb50 (33:5b50)
+Functioncdb50:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -2005,7 +2001,7 @@ Functioncdb50: ; cdb50 (33:5b50)
ld hl, BATTLEANIMSTRUCT_DURATION
add hl, bc
ld [hl], $80
-Functioncdb65: ; cdb65 (33:5b65)
+Functioncdb65:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2024,7 +2020,7 @@ Functioncdb65: ; cdb65 (33:5b65)
ld [hl], a
ret
-BattleAnimFunction_1D: ; cdb80 (33:5b80)
+BattleAnimFunction_1D:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdb9f
@@ -2042,7 +2038,7 @@ BattleAnimFunction_1D: ; cdb80 (33:5b80)
dw Functioncdc57
dw Functioncdc74
-Functioncdb9f: ; cdb9f (33:5b9f)
+Functioncdb9f:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
@@ -2056,7 +2052,7 @@ Functioncdb9f: ; cdb9f (33:5b9f)
ld [hl], a
ret
-Functioncdbb3: ; cdbb3 (33:5bb3)
+Functioncdbb3:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2067,7 +2063,7 @@ Functioncdbb3: ; cdbb3 (33:5bb3)
call Functioncdc75
ret
-Functioncdbc1: ; cdbc1 (33:5bc1)
+Functioncdbc1:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2078,7 +2074,7 @@ Functioncdbc1: ; cdbc1 (33:5bc1)
call Functioncdc75
ret
-Functioncdbcf: ; cdbcf (33:5bcf)
+Functioncdbcf:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2097,7 +2093,7 @@ Functioncdbcf: ; cdbcf (33:5bcf)
inc [hl]
ret
-Functioncdbeb: ; cdbeb (33:5beb)
+Functioncdbeb:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -2110,7 +2106,7 @@ Functioncdbeb: ; cdbeb (33:5beb)
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
add hl, bc
dec [hl]
-asm_cdbfa: ; cdbfa (33:5bfa)
+asm_cdbfa:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
inc [hl]
@@ -2132,17 +2128,17 @@ asm_cdbfa: ; cdbfa (33:5bfa)
ld [hl], e
ret
-Functioncdc1a: ; cdc1a (33:5c1a)
+Functioncdc1a:
call DeinitBattleAnimation
ret
-Functioncdc1e: ; cdc1e (33:5c1e)
+Functioncdc1e:
ld a, BATTLEANIMFRAMESET_4E
call ReinitBattleAnimFrameset
call BattleAnim_IncAnonJumptableIndex
ret
-Functioncdc27: ; cdc27 (33:5c27)
+Functioncdc27:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2155,7 +2151,7 @@ Functioncdc27: ; cdc27 (33:5c27)
ld [hl], a
ret
-Functioncdc39: ; cdc39 (33:5c39)
+Functioncdc39:
ld a, BATTLEANIMFRAMESET_50
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2164,7 +2160,7 @@ Functioncdc39: ; cdc39 (33:5c39)
call BattleAnim_IncAnonJumptableIndex
ret
-Functioncdc48: ; cdc48 (33:5c48)
+Functioncdc48:
ld a, BATTLEANIMFRAMESET_4F
call ReinitBattleAnimFrameset
call BattleAnim_IncAnonJumptableIndex
@@ -2173,7 +2169,7 @@ Functioncdc48: ; cdc48 (33:5c48)
ld [hl], $40
ret
-Functioncdc57: ; cdc57 (33:5c57)
+Functioncdc57:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2192,10 +2188,10 @@ Functioncdc57: ; cdc57 (33:5c57)
.asm_cdc71
call BattleAnim_IncAnonJumptableIndex
-Functioncdc74: ; cdc74 (33:5c74)
+Functioncdc74:
ret
-Functioncdc75: ; cdc75 (33:5c75)
+Functioncdc75:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
@@ -2227,7 +2223,7 @@ Functioncdc75: ; cdc75 (33:5c75)
call BattleAnim_IncAnonJumptableIndex
ret
-BattleAnimFunction_1E: ; cdca6 (33:5ca6)
+BattleAnimFunction_1E:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -2249,13 +2245,13 @@ BattleAnimFunction_1E: ; cdca6 (33:5ca6)
ld [hl], a
ret
-BattleAnimFunction_21: ; cdcc3 (33:5cc3)
+BattleAnimFunction_21:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdcca
dw Functioncdced
-Functioncdcca: ; cdcca (33:5cca)
+Functioncdcca:
ld a, [hBattleTurn]
and a
jr z, .asm_cdcd9
@@ -2277,7 +2273,7 @@ Functioncdcca: ; cdcca (33:5cca)
call ReinitBattleAnimFrameset
ret
-Functioncdced: ; cdced (33:5ced)
+Functioncdced:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2291,7 +2287,7 @@ Functioncdced: ; cdced (33:5ced)
call DeinitBattleAnimation
ret
-Functioncdcfe: ; cdcfe (33:5cfe)
+Functioncdcfe:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -2324,13 +2320,13 @@ Functioncdcfe: ; cdcfe (33:5cfe)
ld [hl], a
ret
-BattleAnimFunction_22: ; cdd2a (33:5d2a)
+BattleAnimFunction_22:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdd31
dw Functioncdd4f
-Functioncdd31: ; cdd31 (33:5d31)
+Functioncdd31:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -2349,7 +2345,7 @@ Functioncdd31: ; cdd31 (33:5d31)
call ReinitBattleAnimFrameset
ret
-Functioncdd4f: ; cdd4f (33:5d4f)
+Functioncdd4f:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2392,13 +2388,13 @@ Functioncdd4f: ; cdd4f (33:5d4f)
inc [hl]
ret
-BattleAnimFunction_23: ; cdd90 (33:5d90)
+BattleAnimFunction_23:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdd97
dw Functioncddbc
-Functioncdd97: ; cdd97 (33:5d97)
+Functioncdd97:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
@@ -2420,7 +2416,7 @@ Functioncdd97: ; cdd97 (33:5d97)
ld a, [hl]
and $7f
ld [hl], a
-Functioncddbc: ; cddbc (33:5dbc)
+Functioncddbc:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2461,14 +2457,14 @@ Functioncddbc: ; cddbc (33:5dbc)
call ReinitBattleAnimFrameset
ret
-BattleAnimFunction_24: ; cddf9 (33:5df9)
+BattleAnimFunction_24:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncde02
dw Functioncde20
dw Functioncde21
-Functioncde02: ; cde02 (33:5e02)
+Functioncde02:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -2485,19 +2481,17 @@ Functioncde02: ; cde02 (33:5e02)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
-Functioncde20: ; cde20 (33:5e20)
+Functioncde20:
ret
-Functioncde21: ; cde21 (33:5e21)
+Functioncde21:
call DeinitBattleAnimation
ret
-; cde25 (33:5e25)
-Unknown_cde25: ; cde25
+Unknown_cde25:
db $ec, $f8, $00
-; cde28
-BattleAnimFunction_25: ; cde28 (33:5e28)
+BattleAnimFunction_25:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2526,7 +2520,7 @@ BattleAnimFunction_25: ; cde28 (33:5e28)
ld [hl], e
ret
-BattleAnimFunction_26: ; cde54 (33:5e54)
+BattleAnimFunction_26:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2542,13 +2536,13 @@ BattleAnimFunction_26: ; cde54 (33:5e54)
inc [hl]
ret
-BattleAnimFunction_27: ; cde6b (33:5e6b)
+BattleAnimFunction_27:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncde72
dw Functioncde88
-Functioncde72: ; cde72 (33:5e72)
+Functioncde72:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -2561,16 +2555,16 @@ Functioncde72: ; cde72 (33:5e72)
.asm_cde83
add BATTLEANIMFRAMESET_6A
call ReinitBattleAnimFrameset
-Functioncde88: ; cde88 (33:5e88)
+Functioncde88:
ret
-BattleAnimFunction_28: ; cde89 (33:5e89)
+BattleAnimFunction_28:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncde90
dw Functioncdebf
-Functioncde90: ; cde90 (33:5e90)
+Functioncde90:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -2602,7 +2596,7 @@ Functioncde90: ; cde90 (33:5e90)
call ReinitBattleAnimFrameset
ret
-Functioncdebf: ; cdebf (33:5ebf)
+Functioncdebf:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2626,7 +2620,7 @@ Functioncdebf: ; cdebf (33:5ebf)
ld [hl], a
ret
-BattleAnimFunction_SpiralDescent: ; cdedd (33:5edd)
+BattleAnimFunction_SpiralDescent:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2667,7 +2661,7 @@ BattleAnimFunction_SpiralDescent: ; cdedd (33:5edd)
call DeinitBattleAnimation
ret
-BattleAnimFunction_2D: ; cdf1b (33:5f1b)
+BattleAnimFunction_2D:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2708,13 +2702,13 @@ BattleAnimFunction_2D: ; cdf1b (33:5f1b)
call DeinitBattleAnimation
ret
-BattleAnimFunction_PoisonGas: ; cdf59 (33:5f59)
+BattleAnimFunction_PoisonGas:
call BattleAnim_AnonJumptable
.anon_dw
dw Functioncdf60
dw BattleAnimFunction_SpiralDescent
-Functioncdf60: ; cdf60 (33:5f60)
+Functioncdf60:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2744,7 +2738,7 @@ Functioncdf60: ; cdf60 (33:5f60)
call BattleAnim_IncAnonJumptableIndex
ret
-BattleAnimFunction_34: ; cdf8c (33:5f8c)
+BattleAnimFunction_34:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2786,7 +2780,7 @@ BattleAnimFunction_34: ; cdf8c (33:5f8c)
call DeinitBattleAnimation
ret
-BattleAnimFunction_3C: ; cdfcb (33:5fcb)
+BattleAnimFunction_3C:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2829,14 +2823,14 @@ BattleAnimFunction_3C: ; cdfcb (33:5fcb)
call DeinitBattleAnimation
ret
-BattleAnimFunction_35: ; ce00b (33:600b)
+BattleAnimFunction_35:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce014
dw Functionce023
dw Functionce05f
-Functionce014: ; ce014 (33:6014)
+Functionce014:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -2844,7 +2838,7 @@ Functionce014: ; ce014 (33:6014)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $10
-Functionce023: ; ce023 (33:6023)
+Functionce023:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2883,18 +2877,18 @@ Functionce023: ; ce023 (33:6023)
srl [hl]
ret
-Functionce05f: ; ce05f (33:605f)
+Functionce05f:
call DeinitBattleAnimation
ret
-BattleAnimFunction_Horn: ; ce063 (33:6063)
+BattleAnimFunction_Horn:
call BattleAnim_AnonJumptable
.anon_dw
dw .zero
dw .one
dw .two
dw Functionce09e
-.zero: ; ce06e (33:606e)
+.zero:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2909,7 +2903,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
ld [hl], a
ret
-.one: ; ce083 (33:6083)
+.one:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -2919,7 +2913,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
call Functionce70a
ret
-.two: ; ce091 (33:6091)
+.two:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -2928,7 +2922,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
call DeinitBattleAnimation
ret
-Functionce09e: ; ce09e (33:609e)
+Functionce09e:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -2953,14 +2947,14 @@ Functionce09e: ; ce09e (33:609e)
ld [hl], a
ret
-BattleAnimFunction_2C: ; ce0c5 (33:60c5)
+BattleAnimFunction_2C:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce0ce
dw Functionce0f8
dw Functionce0dd
-Functionce0ce: ; ce0ce (33:60ce)
+Functionce0ce:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -2971,7 +2965,7 @@ Functionce0ce: ; ce0ce (33:60ce)
ld [hl], a
ret
-Functionce0dd: ; ce0dd (33:60dd)
+Functionce0dd:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -2988,7 +2982,7 @@ Functionce0dd: ; ce0dd (33:60dd)
ld a, [hl]
sub $4
ld [hl], a
-Functionce0f8: ; ce0f8 (33:60f8)
+Functionce0f8:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -3004,13 +2998,13 @@ Functionce0f8: ; ce0f8 (33:60f8)
call Functionce70a
ret
-BattleAnimFunction_2E: ; ce10e (33:610e)
+BattleAnimFunction_2E:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce115
dw Functionce12a
-Functionce115: ; ce115 (33:6115)
+Functionce115:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3022,7 +3016,7 @@ Functionce115: ; ce115 (33:6115)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
-Functionce12a: ; ce12a (33:612a)
+Functionce12a:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
@@ -3055,7 +3049,7 @@ Functionce12a: ; ce12a (33:612a)
srl [hl]
ret
-BattleAnimFunction_2F: ; ce15c (33:615c)
+BattleAnimFunction_2F:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3114,7 +3108,7 @@ BattleAnimFunction_2F: ; ce15c (33:615c)
call DeinitBattleAnimation
ret
-BattleAnimFunction_42: ; ce1b0 (33:61b0)
+BattleAnimFunction_42:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3153,13 +3147,13 @@ BattleAnimFunction_42: ; ce1b0 (33:61b0)
call DeinitBattleAnimation
ret
-BattleAnimFunction_30: ; ce1e7 (33:61e7)
+BattleAnimFunction_30:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce1ee
dw Functionce1fb
-Functionce1ee: ; ce1ee (33:61ee)
+Functionce1ee:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc
@@ -3167,7 +3161,7 @@ Functionce1ee: ; ce1ee (33:61ee)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
-Functionce1fb: ; ce1fb (33:61fb)
+Functionce1fb:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3193,13 +3187,13 @@ Functionce1fb: ; ce1fb (33:61fb)
inc [hl]
ret
-BattleAnimFunction_31: ; ce226 (33:6226)
+BattleAnimFunction_31:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce22d
dw Functionce254
-Functionce22d: ; ce22d (33:622d)
+Functionce22d:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3220,10 +3214,10 @@ Functionce22d: ; ce22d (33:622d)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $f
-Functionce254: ; ce254 (33:6254)
+Functionce254:
ret
-BattleAnimFunction_32: ; ce255 (33:6255)
+BattleAnimFunction_32:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce260
@@ -3231,7 +3225,7 @@ BattleAnimFunction_32: ; ce255 (33:6255)
dw Functionce278
dw Functionce289
-Functionce260: ; ce260 (33:6260)
+Functionce260:
call BattleAnim_IncAnonJumptableIndex
ld a, [hBattleTurn]
and a
@@ -3247,11 +3241,11 @@ Functionce260: ; ce260 (33:6260)
ld [hl], a
ret
-Functionce274: ; ce274 (33:6274)
+Functionce274:
call Functionce29f
ret
-Functionce278: ; ce278 (33:6278)
+Functionce278:
call Functionce29f
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -3262,7 +3256,7 @@ Functionce278: ; ce278 (33:6278)
call Functionce70a
ret
-Functionce289: ; ce289 (33:6289)
+Functionce289:
call Functionce29f
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -3277,7 +3271,7 @@ Functionce289: ; ce289 (33:6289)
call DeinitBattleAnimation
ret
-Functionce29f: ; ce29f (33:629f)
+Functionce29f:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -3303,14 +3297,12 @@ Functionce29f: ; ce29f (33:629f)
ld [wOBP0], a
ret
-; ce2c4 (33:62c4)
-Unknown_ce2c4: ; ce2c4
+Unknown_ce2c4:
db $ff, $aa, $55, $aa
-Unknown_ce2c8: ; ce2c8
+Unknown_ce2c8:
db $ff, $ff, $00, $00
-; ce2cc
-BattleAnimFunction_33: ; ce2cc (33:62cc)
+BattleAnimFunction_33:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3340,14 +3332,14 @@ BattleAnimFunction_33: ; ce2cc (33:62cc)
dec [hl]
ret
-BattleAnimFunction_36: ; ce2fd (33:62fd)
+BattleAnimFunction_36:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce306
dw Functionce330
dw Functionce34c
-Functionce306: ; ce306 (33:6306)
+Functionce306:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3376,7 +3368,7 @@ Functionce306: ; ce306 (33:6306)
ld [hl], e
ret
-Functionce330: ; ce330 (33:6330)
+Functionce330:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
@@ -3399,7 +3391,7 @@ Functionce330: ; ce330 (33:6330)
ld [hl], a
ret
-Functionce34c: ; ce34c (33:634c)
+Functionce34c:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -3413,13 +3405,13 @@ Functionce34c: ; ce34c (33:634c)
call DeinitBattleAnimation
ret
-BattleAnimFunction_37: ; ce35f (33:635f)
+BattleAnimFunction_37:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce366
dw Functionce375
-Functionce366: ; ce366 (33:6366)
+Functionce366:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3427,7 +3419,7 @@ Functionce366: ; ce366 (33:6366)
and $7f
add BATTLEANIMFRAMESET_81
call ReinitBattleAnimFrameset
-Functionce375: ; ce375 (33:6375)
+Functionce375:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 7, [hl]
@@ -3443,21 +3435,21 @@ Functionce375: ; ce375 (33:6375)
dec [hl]
ret
-BattleAnimFunction_38: ; ce389 (33:6389)
+BattleAnimFunction_38:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce392
dw Functionce39c
dw Functionce3ae
-Functionce392: ; ce392 (33:6392)
+Functionce392:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $c
ret
-Functionce39c: ; ce39c (33:639c)
+Functionce39c:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3470,13 +3462,13 @@ Functionce39c: ; ce39c (33:639c)
call BattleAnim_IncAnonJumptableIndex
ld a, BATTLEANIMFRAMESET_20
call ReinitBattleAnimFrameset
-Functionce3ae: ; ce3ae (33:63ae)
+Functionce3ae:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
dec [hl]
ret
-BattleAnimFunction_39: ; ce3b4 (33:63b4)
+BattleAnimFunction_39:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3496,7 +3488,7 @@ BattleAnimFunction_39: ; ce3b4 (33:63b4)
ld [hl], a
ret
-BattleAnimFunction_3A: ; ce3d2 (33:63d2)
+BattleAnimFunction_3A:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3526,13 +3518,13 @@ BattleAnimFunction_3A: ; ce3d2 (33:63d2)
inc [hl]
ret
-BattleAnimFunction_3B: ; ce3ff (33:63ff)
+BattleAnimFunction_3B:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce406
dw Functionce412
-Functionce406: ; ce406 (33:6406)
+Functionce406:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3542,11 +3534,11 @@ Functionce406: ; ce406 (33:6406)
ld [hl], a
ret
-Functionce412: ; ce412 (33:6412)
+Functionce412:
call DeinitBattleAnimation
ret
-BattleAnimFunction_3D: ; ce416 (33:6416)
+BattleAnimFunction_3D:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3570,14 +3562,14 @@ BattleAnimFunction_3D: ; ce416 (33:6416)
inc [hl]
ret
-BattleAnimFunction_3E: ; ce43a (33:643a)
+BattleAnimFunction_3E:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce443
dw Functionce465
dw Functionce490
-Functionce443: ; ce443 (33:6443)
+Functionce443:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3596,7 +3588,7 @@ Functionce443: ; ce443 (33:6443)
and $f0
or $8
ld [hl], a
-Functionce465: ; ce465 (33:6465)
+Functionce465:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3625,7 +3617,7 @@ Functionce465: ; ce465 (33:6465)
.asm_ce48b
ld [hl], $10
call BattleAnim_IncAnonJumptableIndex
-Functionce490: ; ce490 (33:6490)
+Functionce490:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3635,20 +3627,20 @@ Functionce490: ; ce490 (33:6490)
call DeinitBattleAnimation
ret
-BattleAnimFunction_40: ; ce49c (33:649c)
+BattleAnimFunction_40:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce4a3
dw Functionce4b0
-Functionce4a3: ; ce4a3 (33:64a3)
+Functionce4a3:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, BATTLEANIMFRAMESET_24
add [hl]
call ReinitBattleAnimFrameset
-Functionce4b0: ; ce4b0 (33:64b0)
+Functionce4b0:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3678,7 +3670,7 @@ Functionce4b0: ; ce4b0 (33:64b0)
call DeinitBattleAnimation
ret
-BattleAnimFunction_41: ; ce4dc (33:64dc)
+BattleAnimFunction_41:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3708,7 +3700,7 @@ BattleAnimFunction_41: ; ce4dc (33:64dc)
srl [hl]
ret
-BattleAnimFunction_43: ; ce508 (33:6508)
+BattleAnimFunction_43:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3738,7 +3730,7 @@ BattleAnimFunction_43: ; ce508 (33:6508)
call DeinitBattleAnimation
ret
-BattleAnimFunction_44: ; ce532 (33:6532)
+BattleAnimFunction_44:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld e, [hl]
@@ -3767,14 +3759,14 @@ BattleAnimFunction_44: ; ce532 (33:6532)
ld [hl], a
ret
-BattleAnimFunction_45: ; ce55b (33:655b)
+BattleAnimFunction_45:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce564
dw Functionce56e
dw Functionce577
-Functionce564: ; ce564 (33:6564)
+Functionce564:
ld d, $18
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3782,12 +3774,12 @@ Functionce564: ; ce564 (33:6564)
inc [hl]
jr asm_ce58f
-Functionce56e: ; ce56e (33:656e)
+Functionce56e:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $18
-Functionce577: ; ce577 (33:6577)
+Functionce577:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -3805,17 +3797,17 @@ Functionce577: ; ce577 (33:6577)
call DeinitBattleAnimation
ret
-asm_ce58f: ; ce58f (33:658f)
+asm_ce58f:
call Functionce6f1
ret
-BattleAnimFunction_46: ; ce593 (33:6593)
+BattleAnimFunction_46:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce5b3
dw Functionce59a
-Functionce59a: ; ce59a (33:659a)
+Functionce59a:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -3833,10 +3825,10 @@ Functionce59a: ; ce59a (33:659a)
.asm_ce5b0
call DeinitBattleAnimation
-Functionce5b3: ; ce5b3 (33:65b3)
+Functionce5b3:
ret
-BattleAnimFunction_47: ; ce5b4 (33:65b4)
+BattleAnimFunction_47:
ld d, $50
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3863,7 +3855,7 @@ BattleAnimFunction_47: ; ce5b4 (33:65b4)
ld [hl], a
ret
-BattleAnimFunction_48: ; ce5dc (33:65dc)
+BattleAnimFunction_48:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3879,7 +3871,7 @@ BattleAnimFunction_48: ; ce5dc (33:65dc)
call DeinitBattleAnimation
ret
-BattleAnimFunction_49: ; ce5ee (33:65ee)
+BattleAnimFunction_49:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce5f9
@@ -3887,7 +3879,7 @@ BattleAnimFunction_49: ; ce5ee (33:65ee)
dw Functionce622
dw Functionce618
-Functionce5f9: ; ce5f9 (33:65f9)
+Functionce5f9:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3897,7 +3889,7 @@ Functionce5f9: ; ce5f9 (33:65f9)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], $ec
-Functionce60a: ; ce60a (33:660a)
+Functionce60a:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3909,14 +3901,14 @@ Functionce60a: ; ce60a (33:660a)
inc [hl]
ret
-Functionce618: ; ce618 (33:6618)
+Functionce618:
call DeinitBattleAnimation
ret
-asm_ce61c: ; ce61c (33:661c)
+asm_ce61c:
call BattleAnim_IncAnonJumptableIndex
call BattleAnim_IncAnonJumptableIndex
-Functionce622: ; ce622 (33:6622)
+Functionce622:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3928,7 +3920,7 @@ Functionce622: ; ce622 (33:6622)
dec [hl]
ret
-BattleAnimFunction_4A: ; ce62f (33:662f)
+BattleAnimFunction_4A:
call BattleAnim_AnonJumptable
.anon_dw
dw Functionce63a
@@ -3936,7 +3928,7 @@ BattleAnimFunction_4A: ; ce62f (33:662f)
dw Functionce65c
dw Functionce672
-Functionce63a: ; ce63a (33:663a)
+Functionce63a:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -3946,7 +3938,7 @@ Functionce63a: ; ce63a (33:663a)
call BattleAnim_IncAnonJumptableIndex
ret
-Functionce648: ; ce648 (33:6648)
+Functionce648:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3962,7 +3954,7 @@ Functionce648: ; ce648 (33:6648)
inc [hl]
ret
-Functionce65c: ; ce65c (33:665c)
+Functionce65c:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3979,7 +3971,7 @@ Functionce65c: ; ce65c (33:665c)
ld [hl], a
ret
-Functionce672: ; ce672 (33:6672)
+Functionce672:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld a, [hl]
@@ -3996,7 +3988,7 @@ Functionce672: ; ce672 (33:6672)
ld [hl], a
ret
-BattleAnimFunction_4B: ; ce688 (33:6688)
+BattleAnimFunction_4B:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld d, [hl]
@@ -4027,7 +4019,7 @@ BattleAnimFunction_4B: ; ce688 (33:6688)
ld [hl], e
ret
-BattleAnimFunction_4C: ; ce6b3 (33:66b3)
+BattleAnimFunction_4C:
ld d, $18
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -4036,7 +4028,7 @@ BattleAnimFunction_4C: ; ce6b3 (33:66b3)
call Functionce6f1
ret
-BattleAnimFunction_4F: ; ce6bf (33:66bf)
+BattleAnimFunction_4F:
ld d, $18
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
@@ -4049,7 +4041,7 @@ BattleAnimFunction_4F: ; ce6bf (33:66bf)
call Functionce6f1
ret
-BattleAnimFunction_4D: ; ce6d2 (33:66d2)
+BattleAnimFunction_4D:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
@@ -4071,7 +4063,7 @@ BattleAnimFunction_4D: ; ce6d2 (33:66d2)
call DeinitBattleAnimation
ret
-Functionce6f1: ; ce6f1 (33:66f1)
+Functionce6f1:
push af
push de
call BattleAnim_Sine
@@ -4088,7 +4080,7 @@ Functionce6f1: ; ce6f1 (33:66f1)
ld [hl], a
ret
-Functionce70a: ; ce70a (33:670a)
+Functionce70a:
and $f
ld e, a
ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -4104,7 +4096,7 @@ Functionce70a: ; ce70a (33:670a)
jr nz, .asm_ce719
ret
-BattleAnim_AnonJumptable: ; ce71e (33:671e)
+BattleAnim_AnonJumptable:
pop de
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
add hl, bc
@@ -4117,49 +4109,45 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e)
ld l, a
jp hl
-BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
+BattleAnim_IncAnonJumptableIndex:
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
add hl, bc
inc [hl]
ret
-BattleAnim_Cosine: ; ce732 (33:6732)
+BattleAnim_Cosine:
; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2)
; fallthrough
-BattleAnim_Sine: ; ce734 (33:6734)
+BattleAnim_Sine:
; a = d * sin(a * pi/32)
calc_sine_wave BattleAnimSineWave
-BattleAnim_Sine_e: ; ce765 (33:6765)
+BattleAnim_Sine_e:
ld a, e
call BattleAnim_Sine
ld e, a
ret
-BattleAnim_Cosine_e: ; ce76b (33:676b)
+BattleAnim_Cosine_e:
ld a, e
call BattleAnim_Cosine
ld e, a
ret
-; ce771 (33:6771)
-BattleAnim_AbsSinePrecise: ; ce771
+BattleAnim_AbsSinePrecise:
ld a, e
call BattleAnim_Sine
ld e, l
ld d, h
ret
-; ce778
-BattleAnim_AbsCosinePrecise: ; ce778
+BattleAnim_AbsCosinePrecise:
ld a, e
call BattleAnim_Cosine
ld e, l
ld d, h
ret
-; ce77f
-BattleAnimSineWave: ; ce77f
+BattleAnimSineWave:
sine_table 32
-; ce7bf