Battle anims

audio/engine.asm

@@ -2549,7 +2549,7 @@ endr
 	ld [hl], a
 .start
 	call StartChannel
-	ld a, [wc2bc]
+	ld a, [wStereoPanningMask]
 	and a
 	jr z, .next
 	
@@ -2750,7 +2750,7 @@ endr
 	call GetLRTracks
 	add hl, de
 	ld a, [hl]
-	ld hl, wc2bc
+	ld hl, wStereoPanningMask
 	and [hl]
 	
 	ld hl, Channel1Tracks - Channel1
@@ -2766,7 +2766,7 @@ endr
 	jr c, .skip
 	
 ; ch3-4
-	ld a, [wc2be]
+	ld a, [wSFXDuration]
 	
 	ld hl, Channel1Field0x2e - Channel1 ; $c12f - Channel1
 	add hl, bc

battle/anim_commands.asm

@@ -105,9 +105,9 @@ RunBattleAnimScript: ; cc163
 	call Functioncc8d3
 
 .playframe
-	call Functioncc25f
+	call RunBattleAnimCommand
 	call _ExecuteBGEffects
-	call Functioncc96e
+	call BattleAnim_UpdateOAM_All
 	call Function3b0c
 	call BattleAnimRequestPals
 
@@ -283,7 +283,7 @@ endr
 	ret
 ; cc25f
 
-Functioncc25f: ; cc25f
+RunBattleAnimCommand: ; cc25f
 	call .CheckTimer
 	ret nc
 	call .RunScript
@@ -725,24 +725,25 @@ endr
 
 BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
 	call GetBattleAnimByte
-	ld e, $a
+	ld e, 10
 	ld bc, ActiveAnimObjects
-.asm_cc4c8
-	ld hl, $0
+.loop
+	ld hl, BATTLEANIMSTRUCT_INDEX
 	add hl, bc
 	ld d, [hl]
 	ld a, [BattleAnimByte]
 	cp d
-	jr z, .asm_cc4dd
-	ld hl, $18
+	jr z, .increment
+	ld hl, BATTLEANIMSTRUCT_LENGTH
 	add hl, bc
 	ld c, l
 	ld b, h
 	dec e
-	jr nz, .asm_cc4c8
+	jr nz, .loop
 	ret
-.asm_cc4dd
-	ld hl, $e
+
+.increment
+	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
 	inc [hl]
 	ret
@@ -1208,17 +1209,17 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
 	ld e, a
 	srl a
 	srl a
-	ld [wc2be], a
-	call Functioncc7fc
+	ld [wSFXDuration], a
+	call .GetCryTrack
 	and 3
 	ld [CryTracks], a ; CryTracks
 
 	ld e, a
 	ld d, 0
-	ld hl, Datacc7f8
+	ld hl, .GetPanning
 	add hl, de
 	ld a, [hl]
-	ld [wc2bc], a
+	ld [wStereoPanningMask], a
 
 	call GetBattleAnimByte
 	ld e, a
@@ -1228,11 +1229,11 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
 	ret
 ; cc7f8 (33:47f8)
 
-Datacc7f8: ; cc7f8
+.GetPanning: ; cc7f8
 	db $f0, $0f, $f0, $0f
 ; cc7fc
 
-Functioncc7fc: ; cc7fc (33:47fc)
+.GetCryTrack: ; cc7fc (33:47fc)
 	ld a, [hBattleTurn]
 	and a
 	jr nz, .enemy
@@ -1311,7 +1312,7 @@ endr
 	ld a, h
 	ld [CryLength + 1], a
 	ld a, 1
-	ld [wc2bc], a
+	ld [wStereoPanningMask], a
 
 	callab _PlayCryHeader
 
@@ -1478,7 +1479,7 @@ Functioncc94b: ; cc94b
 	ret
 ; cc96e
 
-Functioncc96e: ; cc96e
+BattleAnim_UpdateOAM_All: ; cc96e
 	ld a, $0
 	ld [w5_d418], a
 	ld hl, ActiveAnimObjects
@@ -1491,14 +1492,14 @@ Functioncc96e: ; cc96e
 	ld b, h
 	push hl
 	push de
-	call Functionccfbe
-	call Functioncca09
+	call DoBattleAnimFrame
+	call BattleAnimOAMUpdate
 	pop de
 	pop hl
 	jr c, .done
 
 .next
-	ld bc, $0018
+	ld bc, BATTLEANIMSTRUCT_LENGTH
 	add hl, bc
 	dec e
 	jr nz, .loop

battle/objects/gfx_headers.asm

@@ -0,0 +1,53 @@
+
+AnimObjGFX: ; cfcf6
+
+object_gfx: MACRO
+; label, # tiles
+	db \2
+	db BANK(\1)
+	dw \1
+ENDM
+
+	object_gfx AnimObj00GFX, 0
+	object_gfx AnimObj01GFX, 21
+	object_gfx AnimObj02GFX, 6
+	object_gfx AnimObj03GFX, 6
+	object_gfx AnimObj04GFX, 20
+	object_gfx AnimObj05GFX, 26
+	object_gfx AnimObj06GFX, 18
+	object_gfx AnimObj07GFX, 12
+	object_gfx AnimObj08GFX, 9
+	object_gfx AnimObj09GFX, 17
+	object_gfx AnimObj10GFX, 6
+	object_gfx AnimObj11GFX, 10
+	object_gfx AnimObj12GFX, 9
+	object_gfx AnimObj13GFX, 13
+	object_gfx AnimObj14GFX, 16
+	object_gfx AnimObj15GFX, 2
+	object_gfx AnimObj16GFX, 11
+	object_gfx AnimObj17GFX, 9
+	object_gfx AnimObj18GFX, 9
+	object_gfx AnimObj19GFX, 19
+	object_gfx AnimObj20GFX, 10
+	object_gfx AnimObj21GFX, 12
+	object_gfx AnimObj22GFX, 18
+	object_gfx AnimObj23GFX, 13
+	object_gfx AnimObj24GFX, 10
+	object_gfx AnimObj25GFX, 27
+	object_gfx AnimObj26GFX, 12
+	object_gfx AnimObj27GFX, 14
+	object_gfx AnimObj28GFX, 16
+	object_gfx AnimObj29GFX, 7
+	object_gfx AnimObj30GFX, 8
+	object_gfx AnimObj31GFX, 40
+	object_gfx AnimObj32GFX, 36
+	object_gfx AnimObj33GFX, 16
+	object_gfx AnimObj34GFX, 48
+	object_gfx AnimObj35GFX, 18
+	object_gfx AnimObj36GFX, 38
+	object_gfx AnimObj37GFX, 35
+	object_gfx AnimObj38GFX, 18
+	object_gfx AnimObj39GFX, 24
+	object_gfx NULL, 1
+	object_gfx NULL, 1
+; cfd9e

constants/animation_constants.asm

@@ -1,13 +1,303 @@
+	const_def
+	const BATTLEANIMSTRUCT_INDEX
+	const BATTLEANIMSTRUCT_01
+	const BATTLEANIMSTRUCT_02
+	const BATTLEANIMSTRUCT_FRAMESET_ID
+	const BATTLEANIMSTRUCT_FUNCTION
+	const BATTLEANIMSTRUCT_05
+    const BATTLEANIMSTRUCT_TILEID
+    const BATTLEANIMSTRUCT_07
+    const BATTLEANIMSTRUCT_08
+    const BATTLEANIMSTRUCT_09
+    const BATTLEANIMSTRUCT_0A
+    const BATTLEANIMSTRUCT_0B
+    const BATTLEANIMSTRUCT_DURATION
+    const BATTLEANIMSTRUCT_FRAME
+    const BATTLEANIMSTRUCT_ANON_JT_INDEX
+    const BATTLEANIMSTRUCT_0F
+    const BATTLEANIMSTRUCT_10
+    const BATTLEANIMSTRUCT_11
+    const BATTLEANIMSTRUCT_12
+    const BATTLEANIMSTRUCT_13
+    const BATTLEANIMSTRUCT_14
+    const BATTLEANIMSTRUCT_15
+    const BATTLEANIMSTRUCT_16
+    const BATTLEANIMSTRUCT_17
+BATTLEANIMSTRUCT_LENGTH EQU const_value
+
+	const_def
+	const ANIM_OBJ_00
+    const ANIM_OBJ_01
+    const ANIM_OBJ_02
+    const ANIM_OBJ_03
+    const ANIM_OBJ_04
+    const ANIM_OBJ_05
+    const ANIM_OBJ_06
+    const ANIM_OBJ_07
+    const ANIM_OBJ_08
+    const ANIM_OBJ_09
+    const ANIM_OBJ_0A
+    const ANIM_OBJ_0B
+    const ANIM_OBJ_0C
+    const ANIM_OBJ_0D
+    const ANIM_OBJ_0E
+    const ANIM_OBJ_0F
+    const ANIM_OBJ_BURNED
+    const ANIM_OBJ_11
+    const ANIM_OBJ_12
+    const ANIM_OBJ_13
+    const ANIM_OBJ_14
+    const ANIM_OBJ_15
+    const ANIM_OBJ_16
+    const ANIM_OBJ_17
+    const ANIM_OBJ_18
+    const ANIM_OBJ_19
+    const ANIM_OBJ_1A
+    const ANIM_OBJ_1B
+    const ANIM_OBJ_1C
+    const ANIM_OBJ_1D
+    const ANIM_OBJ_1E
+    const ANIM_OBJ_1F
+    const ANIM_OBJ_20
+    const ANIM_OBJ_21
+    const ANIM_OBJ_22
+    const ANIM_OBJ_23
+    const ANIM_OBJ_24
+    const ANIM_OBJ_25
+    const ANIM_OBJ_26
+    const ANIM_OBJ_27
+    const ANIM_OBJ_28
+    const ANIM_OBJ_29
+    const ANIM_OBJ_FROZEN
+    const ANIM_OBJ_2B
+    const ANIM_OBJ_2C
+    const ANIM_OBJ_2D
+    const ANIM_OBJ_2E
+    const ANIM_OBJ_2F
+    const ANIM_OBJ_30
+    const ANIM_OBJ_31
+    const ANIM_OBJ_32
+    const ANIM_OBJ_33
+    const ANIM_OBJ_34
+    const ANIM_OBJ_35
+    const ANIM_OBJ_36
+    const ANIM_OBJ_37
+    const ANIM_OBJ_38
+    const ANIM_OBJ_39
+    const ANIM_OBJ_3A
+    const ANIM_OBJ_3B
+    const ANIM_OBJ_3C
+    const ANIM_OBJ_3D
+    const ANIM_OBJ_GUST
+    const ANIM_OBJ_3F
+    const ANIM_OBJ_40
+    const ANIM_OBJ_41
+    const ANIM_OBJ_42
+    const ANIM_OBJ_43
+    const ANIM_OBJ_44
+    const ANIM_OBJ_45
+    const ANIM_OBJ_46
+    const ANIM_OBJ_47
+    const ANIM_OBJ_48
+    const ANIM_OBJ_49
+    const ANIM_OBJ_4A
+    const ANIM_OBJ_4B
+    const ANIM_OBJ_4C
+    const ANIM_OBJ_4D
+    const ANIM_OBJ_4E
+    const ANIM_OBJ_4F
+    const ANIM_OBJ_50
+    const ANIM_OBJ_51
+    const ANIM_OBJ_CHICK
+    const ANIM_OBJ_53
+    const ANIM_OBJ_54
+    const ANIM_OBJ_SKULL
+    const ANIM_OBJ_56
+    const ANIM_OBJ_57
+    const ANIM_OBJ_58
+    const ANIM_OBJ_PARALYZED
+    const ANIM_OBJ_5A
+    const ANIM_OBJ_5B
+    const ANIM_OBJ_5C
+    const ANIM_OBJ_5D
+    const ANIM_OBJ_5E
+    const ANIM_OBJ_5F
+    const ANIM_OBJ_60
+    const ANIM_OBJ_61
+    const ANIM_OBJ_62
+    const ANIM_OBJ_63
+    const ANIM_OBJ_64
+    const ANIM_OBJ_65
+    const ANIM_OBJ_66
+    const ANIM_OBJ_67
+    const ANIM_OBJ_68
+    const ANIM_OBJ_69
+    const ANIM_OBJ_6A
+    const ANIM_OBJ_6B
+    const ANIM_OBJ_6C
+    const ANIM_OBJ_6D
+    const ANIM_OBJ_6E
+    const ANIM_OBJ_6F
+    const ANIM_OBJ_70
+    const ANIM_OBJ_71
+    const ANIM_OBJ_72
+    const ANIM_OBJ_73
+    const ANIM_OBJ_74
+    const ANIM_OBJ_75
+    const ANIM_OBJ_76
+    const ANIM_OBJ_77
+    const ANIM_OBJ_78
+    const ANIM_OBJ_79
+    const ANIM_OBJ_7A
+    const ANIM_OBJ_7B
+    const ANIM_OBJ_7C
+    const ANIM_OBJ_7D
+    const ANIM_OBJ_HEART
+    const ANIM_OBJ_7F
+    const ANIM_OBJ_80
+    const ANIM_OBJ_81
+    const ANIM_OBJ_82
+    const ANIM_OBJ_83
+    const ANIM_OBJ_84
+    const ANIM_OBJ_85
+    const ANIM_OBJ_86
+    const ANIM_OBJ_87
+    const ANIM_OBJ_88
+    const ANIM_OBJ_89
+    const ANIM_OBJ_8A
+    const ANIM_OBJ_8B
+    const ANIM_OBJ_8C
+    const ANIM_OBJ_8D
+    const ANIM_OBJ_8E
+    const ANIM_OBJ_8F
+    const ANIM_OBJ_90
+    const ANIM_OBJ_91
+    const ANIM_OBJ_92
+    const ANIM_OBJ_93
+    const ANIM_OBJ_94
+    const ANIM_OBJ_95
+    const ANIM_OBJ_96
+    const ANIM_OBJ_97
+    const ANIM_OBJ_98
+    const ANIM_OBJ_99
+    const ANIM_OBJ_9A
+    const ANIM_OBJ_9B
+    const ANIM_OBJ_9C
+    const ANIM_OBJ_9D
+    const ANIM_OBJ_9E
+    const ANIM_OBJ_9F
+    const ANIM_OBJ_A0
+    const ANIM_OBJ_A1
+    const ANIM_OBJ_A2
+    const ANIM_OBJ_A3
+    const ANIM_OBJ_A4
+    const ANIM_OBJ_A5
+    const ANIM_OBJ_A6
+    const ANIM_OBJ_A7
+    const ANIM_OBJ_A8
+    const ANIM_OBJ_A9
+    const ANIM_OBJ_AA
+    const ANIM_OBJ_AB
+    const ANIM_OBJ_AC
+    const ANIM_OBJ_AD
+    const ANIM_OBJ_AE
+    const ANIM_OBJ_AF
+    const ANIM_OBJ_B0
+    const ANIM_OBJ_B1
+    const ANIM_OBJ_B2
+    const ANIM_OBJ_B3
+    const ANIM_OBJ_B4
+    const ANIM_OBJ_B5
+    const ANIM_OBJ_FLOWER
+    const ANIM_OBJ_COTTON
+    const ANIM_OBJ_B8
+    const ANIM_OBJ_B9
+    const ANIM_OBJ_BA
+    const ANIM_OBJ_BB
+
+	const_def
+	const BATTLEANIMFUNC_00
+    const BATTLEANIMFUNC_01
+    const BATTLEANIMFUNC_02
+    const BATTLEANIMFUNC_03
+    const BATTLEANIMFUNC_04
+    const BATTLEANIMFUNC_05
+    const BATTLEANIMFUNC_06
+    const BATTLEANIMFUNC_07
+    const BATTLEANIMFUNC_08
+    const BATTLEANIMFUNC_09
+    const BATTLEANIMFUNC_0A
+    const BATTLEANIMFUNC_0B
+    const BATTLEANIMFUNC_0C
+    const BATTLEANIMFUNC_0D
+    const BATTLEANIMFUNC_0E
+    const BATTLEANIMFUNC_0F
+    const BATTLEANIMFUNC_10
+    const BATTLEANIMFUNC_11
+    const BATTLEANIMFUNC_12
+    const BATTLEANIMFUNC_13
+    const BATTLEANIMFUNC_14
+    const BATTLEANIMFUNC_15
+    const BATTLEANIMFUNC_16
+    const BATTLEANIMFUNC_17
+    const BATTLEANIMFUNC_18
+    const BATTLEANIMFUNC_19
+    const BATTLEANIMFUNC_1A
+    const BATTLEANIMFUNC_1B
+    const BATTLEANIMFUNC_1C
+    const BATTLEANIMFUNC_1D
+    const BATTLEANIMFUNC_1E
+    const BATTLEANIMFUNC_1F
+    const BATTLEANIMFUNC_20
+    const BATTLEANIMFUNC_21
+    const BATTLEANIMFUNC_22
+    const BATTLEANIMFUNC_23
+    const BATTLEANIMFUNC_24
+    const BATTLEANIMFUNC_25
+    const BATTLEANIMFUNC_26
+    const BATTLEANIMFUNC_27
+    const BATTLEANIMFUNC_28
+    const BATTLEANIMFUNC_29
+    const BATTLEANIMFUNC_2A
+    const BATTLEANIMFUNC_2B
+    const BATTLEANIMFUNC_2C
+    const BATTLEANIMFUNC_2D
+    const BATTLEANIMFUNC_2E
+    const BATTLEANIMFUNC_2F
+    const BATTLEANIMFUNC_30
+    const BATTLEANIMFUNC_31
+    const BATTLEANIMFUNC_32
+    const BATTLEANIMFUNC_33
+    const BATTLEANIMFUNC_34
+    const BATTLEANIMFUNC_35
+    const BATTLEANIMFUNC_36
+    const BATTLEANIMFUNC_37
+    const BATTLEANIMFUNC_38
+    const BATTLEANIMFUNC_39
+    const BATTLEANIMFUNC_3A
+    const BATTLEANIMFUNC_3B
+    const BATTLEANIMFUNC_3C
+    const BATTLEANIMFUNC_3D
+    const BATTLEANIMFUNC_3E
+    const BATTLEANIMFUNC_3F
+    const BATTLEANIMFUNC_40
+    const BATTLEANIMFUNC_41
+    const BATTLEANIMFUNC_42
+    const BATTLEANIMFUNC_43
+    const BATTLEANIMFUNC_44
+    const BATTLEANIMFUNC_45
+    const BATTLEANIMFUNC_46
+    const BATTLEANIMFUNC_47
+    const BATTLEANIMFUNC_48
+    const BATTLEANIMFUNC_49
+    const BATTLEANIMFUNC_4A
+    const BATTLEANIMFUNC_4B
+    const BATTLEANIMFUNC_4C
+    const BATTLEANIMFUNC_4D
+    const BATTLEANIMFUNC_4E
+    const BATTLEANIMFUNC_4F
+
 
-ANIM_OBJ_BURNED EQU $10
-ANIM_OBJ_FROZEN EQU $2a
-ANIM_OBJ_GUST EQU $3e
-ANIM_OBJ_CHICK EQU $52
-ANIM_OBJ_SKULL EQU $55
-ANIM_OBJ_PARALYZED EQU $59
-ANIM_OBJ_HEART EQU $7e
-ANIM_OBJ_FLOWER EQU $b6
-ANIM_OBJ_COTTON EQU $b7
 
 ANIM_BG_FLASH_INVERTED EQU $01
 ANIM_BG_FLASH_WHITE EQU $02

constants/battle_constants.asm

@@ -374,30 +374,3 @@ SUBSTATUS_CURLED       EQU 0
 	const WIN
 	const LOSE
 	const DRAW
-
-	const_def
-	const BATTLEANIMSTRUCT_INDEX
-	const BATTLEANIMSTRUCT_01
-	const BATTLEANIMSTRUCT_02
-	const BATTLEANIMSTRUCT_03
-	const BATTLEANIMSTRUCT_04
-	const BATTLEANIMSTRUCT_05
-    const BATTLEANIMSTRUCT_06
-    const BATTLEANIMSTRUCT_07
-    const BATTLEANIMSTRUCT_08
-    const BATTLEANIMSTRUCT_09
-    const BATTLEANIMSTRUCT_0A
-    const BATTLEANIMSTRUCT_0B
-    const BATTLEANIMSTRUCT_0C
-    const BATTLEANIMSTRUCT_0D
-    const BATTLEANIMSTRUCT_0E
-    const BATTLEANIMSTRUCT_0F
-    const BATTLEANIMSTRUCT_10
-    const BATTLEANIMSTRUCT_11
-    const BATTLEANIMSTRUCT_12
-    const BATTLEANIMSTRUCT_13
-    const BATTLEANIMSTRUCT_14
-    const BATTLEANIMSTRUCT_15
-    const BATTLEANIMSTRUCT_16
-    const BATTLEANIMSTRUCT_17
-BATTLEANIMSTRUCT_LENGTH EQU const_value

data/sprite_engine.asm

@@ -238,7 +238,7 @@ Unknown_8d883: 	db $56, $0a
                 db $58, $09
                 db $5a, $0a
                 db  -2
-Unknown_8d890: 	db $50, $02 ; center
+Unknown_8d890: 	db $50, $02
                 db $5b, $02
                 db $50, $02
                 db $5b, $42

engine/sprites.asm

@@ -436,7 +436,7 @@ GetSpriteAnimFrame: ; 8d132
 	and a
 	jr z, .next_frame ; finished the current sequence
 	dec [hl]
-	call GetSpriteFrameDataPointer ; load pointer from SpriteAnimFrameData
+	call .GetPointer ; load pointer from SpriteAnimFrameData
 	ld a, [hli]
 	push af
 	jr .okay
@@ -445,7 +445,7 @@ GetSpriteAnimFrame: ; 8d132
 	ld hl, SPRITEANIMSTRUCT_FRAME
 	add hl, bc
 	inc [hl]
-	call GetSpriteFrameDataPointer ; load pointer from SpriteAnimFrameData
+	call .GetPointer ; load pointer from SpriteAnimFrameData
 	ld a, [hli]
 	cp -2
 	jr z, .restart
@@ -497,7 +497,7 @@ endr
 	jr .loop
 ; 8d189
 
-GetSpriteFrameDataPointer: ; 8d189
+.GetPointer: ; 8d189
 	; Get the data for the current frame for the current animation sequence
 
 	; SpriteAnimFrameData[SpriteAnim[SPRITEANIMSTRUCT_FRAMESET_ID]][SpriteAnim[SPRITEANIMSTRUCT_FRAME]]

home/cry.asm

@@ -1,7 +1,7 @@
 PlayStereoCry:: ; 37b6
 	push af
 	ld a, 1
-	ld [wc2bc], a
+	ld [wStereoPanningMask], a
 	pop af
 	call _PlayCry
 	call WaitSFX
@@ -13,7 +13,7 @@ PlayStereoCry2:: ; 37c4
 ; Used during pic animations.
 	push af
 	ld a, 1
-	ld [wc2bc], a
+	ld [wStereoPanningMask], a
 	pop af
 	jp _PlayCry
 ; 37ce
@@ -28,7 +28,7 @@ PlayCry2:: ; 37d5
 ; Don't wait for the cry to end.
 	push af
 	xor a
-	ld [wc2bc], a
+	ld [wStereoPanningMask], a
 	ld [CryTracks], a
 	pop af
 	call _PlayCry

macros/move_anim.asm

@@ -113,8 +113,8 @@ anim_resetobp0: macro
 	enum anim_sound_command ; e0
 anim_sound: macro
 	db anim_sound_command
-	db \1 ; tracks
-	db \2 ; id
+	db (\1 << 2) | \2 ; duration, tracks
+	db \3 ; id
 	endm
 
 	enum anim_cry_command ; e1

wram.asm

@@ -330,12 +330,12 @@ Channel1JumpCondition:: ds 1
 Channel2JumpCondition:: ds 1
 Channel3JumpCondition:: ds 1
 Channel4JumpCondition:: ds 1
-wc2bc:: ds 1
+wStereoPanningMask:: ds 1
 CryTracks:: ; c2bd
 ; plays only in left or right track depending on what side the monster is on
 ; both tracks active outside of battle
 	ds 1
-wc2be:: ds 1
+wSFXDuration:: ds 1
 CurSFX:: ; c2bf
 ; id of sfx currently playing
 	ds 1
@@ -3282,9 +3282,9 @@ battle_anim_struct: MACRO
 \1Anim01:: ds 1
 \1Anim02:: ds 1
 \1Anim03:: ds 1
-\1Anim04:: ds 1
+\1AnimFunctionIndex:: ds 1
 \1Anim05:: ds 1
-\1Anim06:: ds 1
+\1AnimTileID:: ds 1
 \1Anim07:: ds 1
 \1Anim08:: ds 1
 \1Anim09:: ds 1
@@ -3292,7 +3292,7 @@ battle_anim_struct: MACRO
 \1Anim0b:: ds 1
 \1Anim0c:: ds 1
 \1Anim0d:: ds 1
-\1Anim0e:: ds 1
+\1AnimAnonJumptableIndex:: ds 1
 \1Anim0f:: ds 1
 \1Anim10:: ds 1
 \1Anim11:: ds 1