Merge pull request #62 from mid-kid/master

Better document splash screen

15 files changed, 721 insertions, 721 deletions

diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 21f15db9..61fa7fb9 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -292,7 +292,6 @@ RunBattleAnimCommand:
 	ld hl, BattleAnimCommands
 	add hl, de
 	add hl, de
-
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -689,7 +688,7 @@ BattleAnimCmd_IncObj:
 	ret
 
 .found
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
@@ -740,7 +739,7 @@ BattleAnimCmd_SetObj:
 
 .found
 	call GetBattleAnimByte
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	ret
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index fcde1be6..37dfce59 100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -39,42 +39,42 @@ endr
 	ld hl, BATTLEANIMSTRUCT_INDEX
 	add hl, bc
 	ld a, [wLastAnimObjectIndex]
-	ld [hli], a ; Index
+	ld [hli], a ; BATTLEANIMSTRUCT_INDEX
 	ld a, [de]
 	inc de
-	ld [hli], a ; 01
+	ld [hli], a ; BATTLEANIMSTRUCT_OAMFLAGS
 	ld a, [de]
 	inc de
-	ld [hli], a ; 02
+	ld [hli], a ; BATTLEANIMSTRUCT_02
 	ld a, [de]
 	inc de
-	ld [hli], a ; Frameset ID
+	ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID
 	ld a, [de]
 	inc de
-	ld [hli], a ; Function
+	ld [hli], a ; BATTLEANIMSTRUCT_FUNCTION
 	ld a, [de]
 	inc de
-	ld [hli], a ; 05
+	ld [hli], a ; BATTLEANIMSTRUCT_PALETTE
 	ld a, [de]
 	call GetBattleAnimTileOffset
-	ld [hli], a ; Tile ID
+	ld [hli], a ; BATTLEANIMSTRUCT_TILEID
 	ld a, [wBattleObjectTempXCoord]
-	ld [hli], a ; X Coord
+	ld [hli], a ; BATTLEANIMSTRUCT_XCOORD
 	ld a, [wBattleObjectTempYCoord]
-	ld [hli], a ; Y Coord
+	ld [hli], a ; BATTLEANIMSTRUCT_YCOORD
 	xor a
-	ld [hli], a ; X Offset
-	ld [hli], a ; Y Offset
+	ld [hli], a ; BATTLEANIMSTRUCT_XOFFSET
+	ld [hli], a ; BATTLEANIMSTRUCT_YOFFSET
 	ld a, [wBattleObjectTempParam]
-	ld [hli], a ; Param
+	ld [hli], a ; BATTLEANIMSTRUCT_PARAM
 	xor a
-	ld [hli], a ; 0c
+	ld [hli], a ; BATTLEANIMSTRUCT_DURATION
 	dec a
-	ld [hli], a ; 0d
+	ld [hli], a ; BATTLEANIMSTRUCT_FRAME
 	xor a
-	ld [hli], a ; 0e
-	ld [hli], a ; 0f
-	ld [hl], a  ; 10
+	ld [hli], a ; BATTLEANIMSTRUCT_JUMPTABLE_INDEX
+	ld [hli], a ; BATTLEANIMSTRUCT_VAR1
+	ld [hl], a  ; BATTLEANIMSTRUCT_VAR2
 	ret
 
 BattleAnimOAMUpdate:
@@ -199,7 +199,7 @@ BattleAnimOAMUpdate:
 	ret
 
 InitBattleAnimBuffer:
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	ld a, [hl]
 
@@ -232,7 +232,7 @@ InitBattleAnimBuffer:
 	and a
 	ret z
 
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	ld a, [hl]
 	ld [wBattleAnimTempOAMFlags], a
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index 8da2f1c2..c23c6e1a 100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -125,7 +125,7 @@ BattleAnimFunction_ThrowFromPlayerToEnemy:
 	add hl, bc
 	dec [hl]
 	; Decrease ??? and hold onto its previous value (argument of the sine function)
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -157,7 +157,7 @@ BattleAnimFunction_04:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	dec [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -197,7 +197,7 @@ BattleAnimFunction_03:
 	jr z, .asm_cd048
 	ld a, $20
 .asm_cd048
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -206,7 +206,7 @@ BattleAnimFunction_03:
 	and $7f
 	ld [hl], a
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -224,7 +224,7 @@ BattleAnimFunction_03:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ret
@@ -305,13 +305,13 @@ BattleAnimFunction_PokeBall:
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_09
 	call ReinitBattleAnimFrameset
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $0
 	inc hl
 	ld [hl], $10
 .four
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld d, [hl]
@@ -319,7 +319,7 @@ BattleAnimFunction_PokeBall:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec a
@@ -327,7 +327,7 @@ BattleAnimFunction_PokeBall:
 	and $1f
 	ret nz
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	sub $4
@@ -341,7 +341,7 @@ BattleAnimFunction_PokeBall:
 .six
 	ld a, BATTLEANIMFRAMESET_0D
 	call ReinitBattleAnimFrameset
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	dec [hl]
 .two
@@ -354,12 +354,12 @@ BattleAnimFunction_PokeBall:
 	ld a, BATTLEANIMFRAMESET_0A
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $20
 .eight
 .ten
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld d, [hl]
@@ -367,7 +367,7 @@ BattleAnimFunction_PokeBall:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec a
@@ -459,7 +459,7 @@ BattleAnimFunction_10:
 	ld a, [hl]
 	swap a
 	and $f
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	ret
@@ -494,13 +494,13 @@ BattleAnimFunction_07:
 	dw .one
 .zero
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
 	inc hl
 	ld [hl], $48
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld d, [hl]
@@ -508,16 +508,16 @@ BattleAnimFunction_07:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $3f
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $20
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -525,7 +525,7 @@ BattleAnimFunction_07:
 	sub [hl]
 	jr z, .done
 	jr c, .done
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ret
@@ -554,16 +554,16 @@ BattleAnimFunction_08:
 	call BattleAnim_IncAnonJumptableIndex
 .one
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $0
 .two
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $40
 	jr nc, .loop_back
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $18
@@ -573,7 +573,7 @@ BattleAnimFunction_08:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $18
@@ -585,7 +585,7 @@ BattleAnimFunction_08:
 	add hl, bc
 	ld a, [hl]
 	and $f
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	add [hl]
 	ld [hl], a
@@ -603,7 +603,7 @@ BattleAnimFunction_08:
 	and $f
 	or d
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	dec [hl]
 	ret
@@ -654,7 +654,7 @@ BattleAnimFunction_09:
 	dw .two
 .zero
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $0
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -665,7 +665,7 @@ BattleAnimFunction_09:
 	add hl, bc
 	ld [hl], a
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -679,7 +679,7 @@ BattleAnimFunction_09:
 	ld a, [hl]
 	swap a
 	and $f
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
@@ -711,7 +711,7 @@ BattleAnimFunction_0A:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	cp $7
@@ -738,7 +738,7 @@ BattleAnimFunction_0A:
 	ld a, BATTLEANIMFRAMESET_10
 	call ReinitBattleAnimFrameset
 .eight
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $10
@@ -754,7 +754,7 @@ BattleAnimFunction_0A:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ret
@@ -804,18 +804,18 @@ BattleAnimFunction_RazorLeaf:
 	dw .eight
 .zero
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $40
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $30
 	jr nc, .sine_cosine
 	call BattleAnim_IncAnonJumptableIndex
 	xor a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hli], a
 	ld [hl], a
@@ -836,7 +836,7 @@ BattleAnimFunction_RazorLeaf:
 	ld a, [hl]
 	and $3f
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -845,7 +845,7 @@ BattleAnimFunction_RazorLeaf:
 	add hl, bc
 	ld [hl], a
 	call Functioncd49c
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -858,7 +858,7 @@ BattleAnimFunction_RazorLeaf:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	ret
@@ -873,7 +873,7 @@ BattleAnimFunction_RazorLeaf:
 	ret
 
 .sine_cosine_2
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $10
@@ -885,18 +885,18 @@ BattleAnimFunction_RazorLeaf:
 	add hl, bc
 	bit 6, [hl]
 	jr nz, .decrease
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	jr .finish
 
 .decrease
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	dec [hl]
 .finish
 	ld de, $80
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -909,7 +909,7 @@ BattleAnimFunction_RazorLeaf:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	ret
@@ -917,7 +917,7 @@ BattleAnimFunction_RazorLeaf:
 .three
 	ld a, BATTLEANIMFRAMESET_16
 	call ReinitBattleAnimFrameset
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	res 5, [hl]
 .four
@@ -992,11 +992,11 @@ BattleAnimFunction_4E:
 	add hl, bc
 	ld [hl], a
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $40
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $30
@@ -1010,7 +1010,7 @@ BattleAnimFunction_4E:
 	ld a, [hl]
 	and $3f
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -1019,7 +1019,7 @@ BattleAnimFunction_4E:
 	add hl, bc
 	ld [hl], a
 	call Functioncd49c
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -1032,7 +1032,7 @@ BattleAnimFunction_4E:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	ret
@@ -1045,11 +1045,11 @@ BattleAnimFunction_0C:
 	dw .two
 .zero
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $c
 .one
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1063,7 +1063,7 @@ BattleAnimFunction_0C:
 
 .next
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $0
 	ld a, BATTLEANIMFRAMESET_22
@@ -1074,7 +1074,7 @@ BattleAnimFunction_0C:
 	ld a, [hl]
 	cp $98
 	jr nc, .okay
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -1085,7 +1085,7 @@ BattleAnimFunction_0C:
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -1103,7 +1103,7 @@ BattleAnimFunction_0C:
 	and $f0
 	ld e, a
 	ld d, $ff
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -1113,7 +1113,7 @@ BattleAnimFunction_0C:
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -1156,7 +1156,7 @@ BattleAnimFunction_0D:
 .asm_cd5e0
 	dec a
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $10
@@ -1176,7 +1176,7 @@ BattleAnimFunction_0D:
 	inc a
 	and $7
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	inc [hl]
@@ -1232,7 +1232,7 @@ Functioncd63c:
 .asm_cd649
 	ld a, $2
 	call Functionce64f
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -1261,7 +1261,7 @@ Functioncd66d:
 	jr c, .asm_cd68c
 	ld a, $2
 	call Functionce64f
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -1282,7 +1282,7 @@ Functioncd66d:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld [hl], $30
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	ld a, [hl]
 	and $1
@@ -1314,7 +1314,7 @@ BattleAnimFunction_11:
 
 .asm_cd6c9
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld l, [hl]
 	ld h, a
@@ -1322,7 +1322,7 @@ BattleAnimFunction_11:
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -1347,7 +1347,7 @@ Functioncd6f0:
 	add hl, bc
 	ld a, [hl]
 	and $f0
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -1357,14 +1357,14 @@ Functioncd6f0:
 	sla a
 	sla a
 	sla a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld [hl], $1
 Functioncd717:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1373,11 +1373,11 @@ Functioncd717:
 	ret
 
 .asm_cd723
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld d, [hl]
 	push af
@@ -1398,7 +1398,7 @@ Functioncd717:
 	xor $1
 	ld [hl], a
 	ret z
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	dec [hl]
 	ret
@@ -1438,20 +1438,20 @@ Functioncd77a:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	bit 7, [hl]
 	jr nz, .asm_cd797
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $10
 	jr .asm_cd79d
 
 .asm_cd797
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
 .asm_cd79d
@@ -1461,7 +1461,7 @@ Functioncd77a:
 	and $7f
 	ld [hl], a
 Functioncd7a5:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -1473,7 +1473,7 @@ Functioncd7a5:
 	ld [hl], a
 	bit 7, a
 	jr nz, .load_no_inc
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc a ; BATTLEANIMFRAMESET_3B
@@ -1481,13 +1481,13 @@ Functioncd7a5:
 	jr .reinit
 
 .load_no_inc
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl] ; BATTLEANIMFRAMESET_3A
 	           ; BATTLEANIMFRAMESET_A0
 .reinit
 	call ReinitBattleAnimFrameset
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
@@ -1498,7 +1498,7 @@ Functioncd7d4:
 	ret
 
 Functioncd7d8:
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $1
 	ret
@@ -1520,13 +1520,13 @@ Functioncd7f0:
 	add hl, bc
 	bit 7, [hl]
 	jr nz, .asm_cd803
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $10
 	jr .asm_cd809
 
 .asm_cd803
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
 .asm_cd809
@@ -1537,7 +1537,7 @@ Functioncd7f0:
 	ld [hl], a
 
 Functioncd811:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -1556,7 +1556,7 @@ Functioncd811:
 	ld a, BATTLEANIMFRAMESET_3C
 .asm_cd82d
 	call ReinitBattleAnimFrameset
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	inc [hl]
@@ -1569,7 +1569,7 @@ Functioncd83a:
 	ret
 
 Functioncd83e:
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $1
 	ret
@@ -1582,7 +1582,7 @@ BattleAnimFunction_18:
 
 Functioncd84c:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $28
 	inc hl
@@ -1591,7 +1591,7 @@ Functioncd858:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld d, [hl]
 	push af
@@ -1606,23 +1606,23 @@ Functioncd858:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr z, .asm_cd895
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
 	ld hl, -$80
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], d
 	ret
@@ -1682,7 +1682,7 @@ asm_cd988:
 
 Functioncd8df:
 	call Functioncd939
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	push af
@@ -1704,7 +1704,7 @@ Functioncd8df:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	sub $8
@@ -1721,14 +1721,14 @@ Functioncd8df:
 	ld [hl], a
 	and $7
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	inc [hl]
 	ret
 
 .asm_cd927
 	xor a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -1741,7 +1741,7 @@ Functioncd8df:
 	ret
 
 Functioncd939:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
 	ld d, 0
@@ -1797,7 +1797,7 @@ Functioncd97f:
 	      ; BATTLEANIMFRAMESET_55
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $8
 Functioncd991:
@@ -1812,13 +1812,13 @@ BattleAnimFunction_LeechSeed:
 	dw .three
 .zero:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $40
 	ret
 
 .one:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $20
@@ -1834,7 +1834,7 @@ BattleAnimFunction_LeechSeed:
 	ret
 
 .two:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1861,7 +1861,7 @@ Functioncd9d2:
 	ld a, [hl]
 	add $2
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld e, [hl]
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -1881,13 +1881,13 @@ Functioncd9d2:
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and $1
@@ -1906,13 +1906,13 @@ BattleAnimFunction_3F:
 
 Functioncda24:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $40
 	ret
 
 Functioncda2e:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $20
@@ -1927,7 +1927,7 @@ Functioncda3e:
 
 BattleAnimFunction_1A:
 	call BattleAnimFunction_03
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add $f
@@ -1952,7 +1952,7 @@ Functioncda59:
 	ld a, [hl]
 	cp $30
 	jr c, .asm_cda69
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $0
 	ret
@@ -1970,7 +1970,7 @@ Functioncda6d:
 	ret nc
 	inc [hl]
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	set 0, [hl]
 	ld hl, BATTLEANIMSTRUCT_02
@@ -1989,7 +1989,7 @@ Functioncda6d:
 
 Functioncda95:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $2c
 	ld hl, BATTLEANIMSTRUCT_FRAME
@@ -2006,7 +2006,7 @@ Functioncdaaa:
 	ret nc
 	inc [hl]
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2036,7 +2036,7 @@ BattleAnimFunction_1D:
 	dw Functioncdbb9
 
 Functioncdae4:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $28
 	inc hl
@@ -2044,7 +2044,7 @@ Functioncdae4:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	ret
@@ -2079,7 +2079,7 @@ Functioncdb14:
 	jr nc, .asm_cdb2b
 	and $f
 	jr nz, asm_cdb3f
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $10
 	call BattleAnim_IncAnonJumptableIndex
@@ -2091,7 +2091,7 @@ Functioncdb14:
 	ret
 
 Functioncdb30:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -2100,7 +2100,7 @@ Functioncdb30:
 	ret
 
 .asm_cdb3a
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	dec [hl]
 asm_cdb3f:
@@ -2110,7 +2110,7 @@ asm_cdb3f:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld d, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld e, [hl]
 	ld hl, -$80
@@ -2120,7 +2120,7 @@ asm_cdb3f:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ret
@@ -2136,7 +2136,7 @@ Functioncdb63:
 	ret
 
 Functioncdb6c:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2161,13 +2161,13 @@ Functioncdb8d:
 	ld a, BATTLEANIMFRAMESET_4F
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $40
 	ret
 
 Functioncdb9c:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $20
@@ -2175,7 +2175,7 @@ Functioncdb9c:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $30
@@ -2189,7 +2189,7 @@ Functioncdbb9:
 	ret
 
 Functioncdbba:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld d, [hl]
@@ -2197,23 +2197,23 @@ Functioncdbba:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $3f
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $20
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	sub $8
 	ld [hl], a
 	ret nz
 	xor a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hli], a
 	ld [hl], a
@@ -2260,7 +2260,7 @@ Functioncdc0f:
 	ld [hl], a
 .asm_cdc1e
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $8
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -2271,7 +2271,7 @@ Functioncdc0f:
 	ret
 
 Functioncdc32:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -2285,7 +2285,7 @@ Functioncdc32:
 	ret
 
 Functioncdc43:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2329,7 +2329,7 @@ Functioncdc76:
 	add hl, bc
 	ld a, [hl]
 	and $3f
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -2348,7 +2348,7 @@ Functioncdc94:
 	ld a, [hl]
 	swap a
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2369,7 +2369,7 @@ Functioncdc94:
 	ld a, [hl]
 	cp $80
 	ret nc
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and $3
@@ -2396,7 +2396,7 @@ Functioncdcdc:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -2404,7 +2404,7 @@ Functioncdcdc:
 	ld a, [hl]
 	and $80
 	rlca
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	add [hl] ; BATTLEANIMFRAMESET_61 BATTLEANIMFRAMESET_62
 	         ; BATTLEANIMFRAMESET_9C BATTLEANIMFRAMESET_9D
@@ -2441,7 +2441,7 @@ Functioncdd01:
 	jr z, .asm_cdd35
 	and $1f
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc a ; BATTLEANIMFRAMESET_62
@@ -2449,7 +2449,7 @@ Functioncdd01:
 	jr .asm_cdd3a
 
 .asm_cdd35
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl] ; BATTLEANIMFRAMESET_61
 	           ; BATTLEANIMFRAMESET_9C
@@ -2492,7 +2492,7 @@ Unknown_cdd6a:
 	db $ec, $f8, $00
 
 BattleAnimFunction_25:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2505,7 +2505,7 @@ BattleAnimFunction_25:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld d, [hl]
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
 	lb hl, -1, $a0
@@ -2515,13 +2515,13 @@ BattleAnimFunction_25:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	ret
 
 BattleAnimFunction_26:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -2549,7 +2549,7 @@ Functioncddb7:
 	ld a, [hl]
 	and a
 	jr nz, .asm_cddc8
-	ld hl, BATTLEANIMSTRUCT_01
+	ld hl, BATTLEANIMSTRUCT_OAMFLAGS
 	add hl, bc
 	set 6, [hl]
 .asm_cddc8
@@ -2566,7 +2566,7 @@ BattleAnimFunction_28:
 
 Functioncddd5:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $0
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -2597,7 +2597,7 @@ Functioncddd5:
 	ret
 
 Functioncde04:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -2609,7 +2609,7 @@ Functioncde04:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
@@ -2621,7 +2621,7 @@ Functioncde04:
 	ret
 
 BattleAnimFunction_SpiralDescent:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $18
@@ -2631,7 +2631,7 @@ BattleAnimFunction_SpiralDescent:
 	sra a
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2643,13 +2643,13 @@ BattleAnimFunction_SpiralDescent:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $7
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $28
@@ -2662,7 +2662,7 @@ BattleAnimFunction_SpiralDescent:
 	ret
 
 BattleAnimFunction_2D:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $18
@@ -2672,7 +2672,7 @@ BattleAnimFunction_2D:
 	sra a
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2684,13 +2684,13 @@ BattleAnimFunction_2D:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $3
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $28
@@ -2715,7 +2715,7 @@ Functioncdea5:
 	cp $84
 	jr nc, .next
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -2749,7 +2749,7 @@ BattleAnimFunction_34:
 	sra a
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2768,7 +2768,7 @@ BattleAnimFunction_34:
 	ld a, [hl]
 	and $7
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $e8
@@ -2791,7 +2791,7 @@ BattleAnimFunction_3C:
 	sra a
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2810,7 +2810,7 @@ BattleAnimFunction_3C:
 	ld a, [hl]
 	and $3
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $d0
@@ -2832,10 +2832,10 @@ BattleAnimFunction_35:
 
 Functioncdf59:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $34
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $10
 Functioncdf68:
@@ -2849,10 +2849,10 @@ Functioncdf68:
 .asm_cdf72
 	ld a, $2
 	call Functionce64f
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld d, [hl]
 	call BattleAnim_Sine
@@ -2864,7 +2864,7 @@ Functioncdf68:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	sub $4
@@ -2872,7 +2872,7 @@ Functioncdf68:
 	and $1f
 	cp $20
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	srl [hl]
 	ret
@@ -2892,13 +2892,13 @@ BattleAnimFunction_Horn:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
@@ -2914,7 +2914,7 @@ BattleAnimFunction_Horn:
 	ret
 
 .two:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $20
@@ -2923,7 +2923,7 @@ BattleAnimFunction_Horn:
 	ret
 
 Functioncdfe3:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld d, $8
@@ -2934,13 +2934,13 @@ Functioncdfe3:
 	sra a
 	xor $ff
 	inc a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	add $8
@@ -2960,13 +2960,13 @@ Functionce013:
 	ld a, [hl]
 	and $f0
 	swap a
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	ret
 
 Functionce022:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, $10
@@ -2977,7 +2977,7 @@ Functionce022:
 	jr z, .asm_ce035
 	ld [hl], a
 .asm_ce035
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	sub $4
@@ -3006,18 +3006,18 @@ BattleAnimFunction_2E:
 
 Functionce05a:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $28
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
 	sub $28
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 Functionce06f:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld d, [hl]
@@ -3025,7 +3025,7 @@ Functionce06f:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -3036,13 +3036,13 @@ Functionce06f:
 	add hl, bc
 	dec [hl]
 .asm_ce08e
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $3f
 	ret nz
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $20
 	inc hl
@@ -3053,7 +3053,7 @@ BattleAnimFunction_2F:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld d, [hl]
 	push af
@@ -3090,7 +3090,7 @@ BattleAnimFunction_2F:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	cp $5a
 	jr nc, .asm_ce0ef
@@ -3113,7 +3113,7 @@ BattleAnimFunction_42:
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld d, [hl]
 	push af
@@ -3128,11 +3128,11 @@ BattleAnimFunction_42:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	cp $40
 	jr nc, .asm_ce124
@@ -3158,7 +3158,7 @@ Functionce133:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 Functionce140:
@@ -3167,7 +3167,7 @@ Functionce140:
 	ld a, [hl]
 	ld d, $30
 	call BattleAnim_Sine
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -3211,7 +3211,7 @@ Functionce172:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $f
 Functionce199:
@@ -3236,7 +3236,7 @@ Functionce1a5:
 .asm_ce1b1
 	ld a, $cc
 .asm_ce1b3
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
@@ -3272,7 +3272,7 @@ Functionce1ce:
 	ret
 
 Functionce1e4:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and $7
@@ -3291,7 +3291,7 @@ Functionce1e4:
 .asm_ce1fe
 	add hl, de
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	and [hl]
 	ld [wOBP0], a
@@ -3311,7 +3311,7 @@ BattleAnimFunction_33:
 	sra a
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	add [hl]
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -3326,7 +3326,7 @@ BattleAnimFunction_33:
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	dec [hl]
 	dec [hl]
@@ -3346,14 +3346,14 @@ Functionce24b:
 	cp $e0
 	jr nz, .asm_ce25e
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $2
 	ret
 
 .asm_ce25e
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld e, [hl]
 	ld hl, -$80
@@ -3363,13 +3363,13 @@ Functionce24b:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ret
 
 Functionce275:
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -3379,7 +3379,7 @@ Functionce275:
 
 .asm_ce27f
 	ld [hl], $4
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	xor $ff
@@ -3444,13 +3444,13 @@ BattleAnimFunction_38:
 
 Functionce2d7:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $c
 	ret
 
 Functionce2e1:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -3469,7 +3469,7 @@ Functionce2f3:
 	ret
 
 BattleAnimFunction_39:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -3571,7 +3571,7 @@ BattleAnimFunction_3E:
 
 Functionce388:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $28
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -3590,7 +3590,7 @@ Functionce388:
 	or $8
 	ld [hl], a
 Functionce3aa:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -3619,7 +3619,7 @@ Functionce3aa:
 	ld [hl], $10
 	call BattleAnim_IncAnonJumptableIndex
 Functionce3d5:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -3648,7 +3648,7 @@ Functionce3f5:
 	cp $38
 	jr nc, .asm_ce41d
 	inc [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -3678,7 +3678,7 @@ BattleAnimFunction_41:
 	and a
 	ret z
 	ld d, a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -3691,7 +3691,7 @@ BattleAnimFunction_41:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and $1f
@@ -3702,7 +3702,7 @@ BattleAnimFunction_41:
 	ret
 
 BattleAnimFunction_43:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $10
@@ -3735,7 +3735,7 @@ BattleAnimFunction_44:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld e, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld d, [hl]
 	ld a, e
@@ -3777,11 +3777,11 @@ Functionce4a9:
 
 Functionce4b3:
 	call BattleAnim_IncAnonJumptableIndex
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $18
 Functionce4bc:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $80
@@ -3841,7 +3841,7 @@ BattleAnimFunction_47:
 	call BattleAnim_Sine
 	sra a
 	sra a
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	add [hl]
 	inc [hl]
@@ -3933,7 +3933,7 @@ Functionce57f:
 	ld hl, BATTLEANIMSTRUCT_PARAM
 	add hl, bc
 	ld a, [hl]
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], a
 	call BattleAnim_IncAnonJumptableIndex
@@ -3993,7 +3993,7 @@ BattleAnimFunction_4B:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld d, [hl]
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld e, [hl]
 	ld hl, BATTLEANIMSTRUCT_PARAM
@@ -4015,7 +4015,7 @@ BattleAnimFunction_4B:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], d
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	ret
@@ -4031,7 +4031,7 @@ BattleAnimFunction_4C:
 
 BattleAnimFunction_4F:
 	ld d, $18
-	ld hl, BATTLEANIMSTRUCT_10
+	ld hl, BATTLEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -4043,7 +4043,7 @@ BattleAnimFunction_4F:
 	ret
 
 BattleAnimFunction_4D:
-	ld hl, BATTLEANIMSTRUCT_0F
+	ld hl, BATTLEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $20
@@ -4099,7 +4099,7 @@ Functionce64f:
 
 BattleAnim_AnonJumptable:
 	pop de
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld l, [hl]
 	ld h, $0
@@ -4111,7 +4111,7 @@ BattleAnim_AnonJumptable:
 	jp hl
 
 BattleAnim_IncAnonJumptableIndex:
-	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
+	ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 61dba7d9..39c92b2e 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -217,11 +217,11 @@ Cut_SpawnLeaf:
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], FIELDMOVE_GRASS
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld [hl], $4
 	pop af
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	pop de
@@ -341,7 +341,7 @@ FlyToAnim:
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
 	ld [hl], SPRITE_ANIM_SEQ_FLY_TO
-	ld hl, SPRITEANIMSTRUCT_0F
+	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld [hl], 11 * 8
 	ld a, 64
diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm
index 2fe4c1ce..55c74407 100644
--- a/engine/games/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@@ -523,7 +523,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
 	ret
 
 .pressed_a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc a
@@ -538,7 +538,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
 	ret z
 	sub 1 tiles
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	dec [hl]
 	ret
@@ -551,7 +551,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
 	ret z
 	add 1 tiles
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ret
@@ -564,7 +564,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
 	ret z
 	sub 1 tiles
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	sub 9
@@ -579,7 +579,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
 	ret z
 	add 1 tiles
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add 9
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index b4935b2e..df34a7de 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -1139,7 +1139,7 @@ ReelAction_InitGolem:
 	depixel 12, 13
 	ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
 	call InitSpriteAnimStruct
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	pop af
 	ld [hl], a
@@ -1962,7 +1962,7 @@ Slots_AnimateGolem:
 	dw .roll
 
 .init
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1979,7 +1979,7 @@ Slots_AnimateGolem:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
 	ld hl, SPRITEANIMSTRUCT_XOFFSET
@@ -1987,7 +1987,7 @@ Slots_AnimateGolem:
 	ld [hl], $0
 
 .fall
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $20
@@ -2006,7 +2006,7 @@ Slots_AnimateGolem:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $2
 	ld a, 1
@@ -2025,7 +2025,7 @@ Slots_AnimateGolem:
 	jr nc, .restart
 	and $3
 	ret nz
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	xor $ff
@@ -2095,11 +2095,11 @@ Slots_AnimateChansey:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $8
 .two
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index d0d3856e..609e48f9 100644
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -114,7 +114,7 @@ SetPartyMonIconAnimSpeed:
 	ld [hl], a
 	rlca
 	rlca
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], a
 	ret
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index fd5fb020..8abad293 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -36,8 +36,8 @@ DoAnimFrame:
 	dw .UnusedJigglypuff
 	dw .NamingScreenCursor
 	dw .GameFreakLogo
-	dw .GSIntroStar
-	dw .GSIntroSparkle
+	dw .GSGameFreakLogoStar
+	dw .GSGameFreakLogoSparkle
 	dw .SlotsGolem
 	dw .SlotsChansey
 	dw .SlotsChanseyEgg
@@ -81,7 +81,7 @@ DoAnimFrame:
 	add hl, bc
 	ld [hl], 8 * 3
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	ld d, a
@@ -89,7 +89,7 @@ DoAnimFrame:
 	and $f
 	ret nz
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
 
@@ -138,7 +138,7 @@ DoAnimFrame:
 	ret
 
 .GSIntroBubble
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -148,7 +148,7 @@ DoAnimFrame:
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	dec [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add $02
@@ -191,7 +191,7 @@ DoAnimFrame:
 
 	and $03
 	swap a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 
@@ -211,7 +211,7 @@ DoAnimFrame:
 
 	add d
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add e
@@ -235,7 +235,7 @@ DoAnimFrame:
 	jr nc, .asm_8d5bb
 
 	inc [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -276,14 +276,14 @@ DoAnimFrame:
 
 .asm_8d5d8
 	call .IncrementJumptableIndex
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $b0
 	ret
 
 .Function8d5e2
 	call .Function8d60b
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -314,7 +314,7 @@ DoAnimFrame:
 	ret
 
 .Function8d60b
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -323,7 +323,7 @@ DoAnimFrame:
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and $1
@@ -346,7 +346,7 @@ DoAnimFrame:
 	swap a
 	sla a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 .Function8d63e
@@ -358,7 +358,7 @@ DoAnimFrame:
 	inc [hl]
 	ld d, $04
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add $02
@@ -369,7 +369,7 @@ DoAnimFrame:
 	add hl, bc
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	and $2
 	ret z
@@ -433,7 +433,7 @@ DoAnimFrame:
 
 .asm_8d6a7
 	call .IncrementJumptableIndex
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $30
 	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_2
@@ -441,7 +441,7 @@ DoAnimFrame:
 	ret
 
 .Function8d6b6
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -456,7 +456,7 @@ DoAnimFrame:
 	ret
 
 .Function8d6c9
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add $04
@@ -518,7 +518,7 @@ DoAnimFrame:
 .asm_8d717
 	call .IncrementJumptableIndex
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $30
 	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL_2
@@ -526,7 +526,7 @@ DoAnimFrame:
 	ret
 
 .Function8d726
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -543,7 +543,7 @@ DoAnimFrame:
 	ret
 
 .Function8d73c
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add $04
@@ -593,7 +593,7 @@ DoAnimFrame:
 	and $3
 	swap a
 	add e
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
@@ -606,14 +606,14 @@ DoAnimFrame:
 	dec [hl]
 	dec [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld d, a
 	add $8
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	push af
@@ -643,16 +643,16 @@ DoAnimFrame:
 
 .Function8d7b9
 	call .IncrementJumptableIndex
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $30
 	ret
 
 .Function8d7c9
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $3c
@@ -667,7 +667,7 @@ DoAnimFrame:
 	add hl, bc
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -691,16 +691,16 @@ DoAnimFrame:
 
 .Function8d7f7
 	call .IncrementJumptableIndex
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $10
 	ret
 
 .Function8d807
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $3c
@@ -712,7 +712,7 @@ DoAnimFrame:
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -740,14 +740,14 @@ IF DEF(_GOLD)
 	add hl, bc
 	ld a, [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	and $3
 	ld [hl], a
 	inc [hl]
 	swap a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 
@@ -758,7 +758,7 @@ IF DEF(_GOLD)
 	cp $a4
 	jr nc, .asm_8d881
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	add $4
 
@@ -770,14 +770,14 @@ IF DEF(_GOLD)
 	add hl, bc
 	inc [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	sla a
 	sla a
 
 	ld d, 2
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	add 3
@@ -805,7 +805,7 @@ ELIF DEF(_SILVER)
 	add $3
 	ld d, a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [wIntroSceneTimer]
 	and $30
@@ -834,7 +834,7 @@ ELIF DEF(_SILVER)
 ENDC
 
 .GSIntroHoOhLugia
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 IF DEF(_GOLD)
@@ -906,7 +906,7 @@ ENDC
 	ret
 
 .Function8d8e1
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -947,12 +947,12 @@ ENDC
 	callfar ComposeMail_AnimateCursor
 	ret
 
-.GameFreakLogo:
+.GameFreakLogo
 	callfar GameFreakPresents_UpdateLogoPal
 	ret
 
-.GSIntroStar
-	ld hl, SPRITEANIMSTRUCT_0C
+.GSGameFreakLogoStar
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -963,7 +963,7 @@ ENDC
 	and $1f
 	jr nz, .asm_8d943
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	dec [hl]
 .asm_8d943
@@ -985,7 +985,7 @@ ENDC
 	add hl, bc
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 
@@ -1001,14 +1001,14 @@ ENDC
 	call DeinitializeSprite
 	ret
 
-.GSIntroSparkle
-	ld hl, SPRITEANIMSTRUCT_0C
+.GSGameFreakLogoSparkle
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	or [hl]
 	jr z, .asm_8d9cc
 
-	ld hl, SPRITEANIMSTRUCT_0F
+	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld d, [hl]
 
@@ -1030,13 +1030,13 @@ ENDC
 	add hl, bc
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -1045,13 +1045,13 @@ ENDC
 	ld e, l
 	ld d, h
 
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -1061,7 +1061,7 @@ ENDC
 	ld e, l
 	ld d, h
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], e
 	inc hl
@@ -1158,13 +1158,13 @@ ENDC
 	add hl, bc
 	ld [hl], $2
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $20
 	ret
 
 .TradePokeBall_two
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1175,12 +1175,12 @@ ENDC
 .asm_8da5d
 	call .IncrementJumptableIndex
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $40
 
 .TradePokeBall_three
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp 48
@@ -1204,24 +1204,24 @@ ENDC
 	add hl, bc
 	ld [hl], $4
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $30
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $24
 	ret
 
 .TradePokeBall_four
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr z, .asm_8daca
 
 	ld d, a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	call Sprites_Sine
@@ -1230,18 +1230,18 @@ ENDC
 	add hl, bc
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	inc [hl]
 	ld a, [hl]
 	and $3f
 	ret nz
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $20
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	sub $c
@@ -1285,7 +1285,7 @@ ENDC
 	ret
 
 .RevealNewMon:
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $80
@@ -1326,7 +1326,7 @@ ENDC
 	ret
 
 .CutLeaves
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -1336,13 +1336,13 @@ ENDC
 	ld e, l
 	ld d, h
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -1371,7 +1371,7 @@ ENDC
 	and a
 	ret z
 
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -1383,7 +1383,7 @@ ENDC
 	dec [hl]
 	dec [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0F
+	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld a, [hl]
 	ld d, a
@@ -1392,7 +1392,7 @@ ENDC
 	add $8
 	ld [hl], a
 .skip
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -1417,7 +1417,7 @@ ENDC
 	dec [hl]
 
 	ld d, $40
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -1444,7 +1444,7 @@ ENDC
 	inc [hl]
 	inc [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0F
+	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld a, [hl]
 	ld d, a
@@ -1453,7 +1453,7 @@ ENDC
 	sub $2
 	ld [hl], a
 .asm_8dbce
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm
index d902ff59..57b0187e 100644
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -160,44 +160,45 @@ _InitSpriteAnimStruct::
 	add hl, bc
 ; Load the index.
 	ld a, [wSpriteAnimCount]
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_INDEX
 ; Copy the table entry to the next two fields.
 	ld a, [de]
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_FRAMESET_ID
 	inc de
 	ld a, [de]
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	inc de
 ; Look up the third field from the table in the wSpriteAnimDict array (10x2).
 ; Take the value and load it in
 	ld a, [de]
 	call GetSpriteAnimVTile
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_TILE_ID
 	pop de
 ; Set hl to field 4 (X coordinate).  Kinda pointless, because we're presumably already here.
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 ; Load the original value of de into here.
 	ld a, e
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_XCOORD
 	ld a, d
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_YCOORD
 ; load 0 into the next four fields
 	xor a
-	ld [hli], a
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_XOFFSET
+	ld [hli], a ; SPRITEANIMSTRUCT_YOFFSET
 	xor a
-	ld [hli], a
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_DURATION
+	ld [hli], a ; SPRITEANIMSTRUCT_DURATIONOFFSET
 ; load -1 into the next field
 	dec a
-	ld [hli], a
+	ld [hli], a ; SPRITEANIMSTRUCT_FRAME
 ; load 0 into the last five fields
 	xor a
-rept 4
-	ld [hli], a
-endr
-	ld [hl], a
+	ld [hli], a ; SPRITEANIMSTRUCT_JUMPTABLE_INDEX
+	ld [hli], a ; SPRITEANIMSTRUCT_VAR1
+	ld [hli], a ; SPRITEANIMSTRUCT_VAR2
+	ld [hli], a ; SPRITEANIMSTRUCT_VAR3
+	ld [hl], a  ; SPRITEANIMSTRUCT_VAR4
 ; back up the address of the first field to wSpriteAnimAddrBackup
 	ld a, c
 	ld [wSpriteAnimAddrBackup], a
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index b00f72fb..784da3cf 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -849,7 +849,7 @@ Intro_PlaceChrisSprite:
 NUM_TITLESCREENOPTIONS EQU const_value
 
 IntroSequence:
-	callfar Copyright_GameFreakPresents
+	callfar SplashScreen
 	jr c, StartTitleScreen
 	callfar GoldSilverIntro
 
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 6938dc63..89146914 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -363,7 +363,7 @@ NamingScreenJoypadLoop:
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld [hl], a
 	ld hl, wJumptableIndex
@@ -403,10 +403,10 @@ NamingScreenJoypadLoop:
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $8
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $4
 	call NamingScreen_IsTargetBox
@@ -446,7 +446,7 @@ NamingScreenJoypadLoop:
 	ld b, [hl]
 
 NamingScreen_GetCursorPosition:
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	push bc
@@ -458,7 +458,7 @@ NamingScreen_GetCursorPosition:
 	cp b
 	pop bc
 	jr nz, .not_bottom_row
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $3
@@ -482,7 +482,7 @@ NamingScreen_GetCursorPosition:
 
 NamingScreen_AnimateCursor:
 	call .GetDPad
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld e, a
@@ -502,13 +502,13 @@ NamingScreen_AnimateCursor:
 	ld de, .CaseDelEnd
 	ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 1
 .ok2
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	add [hl] ; default SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld l, [hl]
 	ld h, $0
@@ -545,7 +545,7 @@ NamingScreen_AnimateCursor:
 	call NamingScreen_GetCursorPosition
 	and a
 	jr nz, .asm_11e76
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $8
@@ -565,7 +565,7 @@ NamingScreen_AnimateCursor:
 	ld e, a
 	add a
 	add e
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
@@ -574,7 +574,7 @@ NamingScreen_AnimateCursor:
 	call NamingScreen_GetCursorPosition
 	and a
 	jr nz, .asm_11e97
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -596,13 +596,13 @@ NamingScreen_AnimateCursor:
 	ld e, a
 	add a
 	add e
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
 
 .down
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	call NamingScreen_IsTargetBox
@@ -623,7 +623,7 @@ NamingScreen_AnimateCursor:
 	ret
 
 .up
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1044,7 +1044,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	ld [hl], a
 	ld hl, wJumptableIndex
@@ -1094,10 +1094,10 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $9
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld [hl], $5
 	ret
@@ -1140,7 +1140,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 
 ComposeMail_AnimateCursor:
 	call .GetDPad
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	ld e, a
@@ -1155,13 +1155,13 @@ ComposeMail_AnimateCursor:
 	ld de, .CaseDelEnd
 	ld a, 1
 .got_pointer
-	ld hl, SPRITEANIMSTRUCT_0E
+	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
 	add [hl]
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld l, [hl]
 	ld h, 0
@@ -1198,7 +1198,7 @@ ComposeMail_AnimateCursor:
 	call ComposeMail_GetCursorPosition
 	and a
 	jr nz, .case_del_done_right
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $9
@@ -1218,7 +1218,7 @@ ComposeMail_AnimateCursor:
 	ld e, a
 	add a
 	add e
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
@@ -1227,7 +1227,7 @@ ComposeMail_AnimateCursor:
 	call ComposeMail_GetCursorPosition
 	and a
 	jr nz, .caps_del_done_left
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1249,13 +1249,13 @@ ComposeMail_AnimateCursor:
 	ld e, a
 	add a
 	add e
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], a
 	ret
 
 .down
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $5
@@ -1268,7 +1268,7 @@ ComposeMail_AnimateCursor:
 	ret
 
 .up
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1287,12 +1287,12 @@ NamingScreen_PressedA_GetCursorCommand:
 	ld b, [hl]
 
 ComposeMail_GetCursorPosition:
-	ld hl, SPRITEANIMSTRUCT_0D
+	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld a, [hl]
 	cp $5
 	jr nz, .letter
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	cp $3
diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm
index c8a6b370..e6d975b0 100644
--- a/engine/movie/evolution_animation.asm
+++ b/engine/movie/evolution_animation.asm
@@ -249,7 +249,7 @@ EvolutionAnimation:
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $0
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $10
 	ret
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index c9f9ac11..01eff145 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -1,347 +1,3 @@
-Copyright_GameFreakPresents:
-; Play the copyright screen and GameFreak Presents sequence.
-; Return carry if user cancels animation by pressing a button.
-
-	call ClearBGPalettes
-	call ClearTilemap
-	ld a, HIGH(vBGMap0)
-	ldh [hBGMapAddress + 1], a
-	xor a ; LOW(vBGMap0)
-	ldh [hBGMapAddress], a
-	ldh [hJoyDown], a
-	ldh [hSCX], a
-	ldh [hSCY], a
-	ld a, SCREEN_HEIGHT_PX
-	ldh [hWY], a
-	call WaitBGMap
-	ld b, SCGB_GAMEFREAK_LOGO
-	call GetSGBLayout
-	call SetPalettes
-	ld c, 10
-	call DelayFrames
-	callfar Copyright
-	call WaitBGMap
-	ld c, 100
-	call DelayFrames
-	call ClearTilemap
-	call .GetGFLogoGFX
-
-.loop
-	call .PlayFrame
-	jr nc, .loop
-
-; high bits of wJumptableIndex are recycled for some flags
-; this was set if user canceled by pressing a button
-	ld a, [wJumptableIndex]
-	bit 6, a
-	jr nz, .canceled
-
-; clear carry flag from GameFreakPresents_PlayFrame
-	and a
-	ret
-
-.canceled
-	scf
-	ret
-
-.GetGFLogoGFX:
-; Load gfx and initialize variables
-
-	ld de, GameFreakPresentsGFX1
-	ld hl, vTiles1
-	lb bc, BANK(GameFreakPresentsGFX1), 28
-	call Get1bpp
-
-	ld de, GameFreakPresentsGFX2
-	ld hl, vTiles1 tile 28
-	lb bc, BANK(GameFreakPresentsGFX2), 5
-	call Request2bpp
-
-	farcall ClearSpriteAnims
-
-	ld hl, wSpriteAnimDict
-	ld a, 6
-	ld [hli], a
-	ld a, $8d
-	ld [hl], a
-	xor a
-	ld [wJumptableIndex], a
-	ld [wIntroSceneFrameCounter], a
-	ld [wIntroSceneTimer], a
-	ldh [hSCX], a
-	ldh [hSCY], a
-	ld a, 1
-	ldh [hBGMapMode], a
-	ld a, SCREEN_HEIGHT_PX
-	ldh [hWY], a
-	lb de, %00100100, %11111000
-	call DmgToCgbObjPals
-	ret
-
-.PlayFrame:
-; Play one frame of GameFreakPresents sequence.
-; Return carry when the sequence completes or is canceled.
-
-	call JoyTextDelay
-	ldh a, [hJoyLast]
-	and BUTTONS
-	jr nz, .pressed_button
-
-; high bits of wJumptableIndex are recycled for some flags
-; this is set when the sequence finished
-	ld a, [wJumptableIndex]
-	bit 7, a
-	jr nz, .finish
-
-	farcall PlaySpriteAnimations
-
-	call PlaceGameFreakPresents
-	call DelayFrame
-
-; ensure carry is cleared
-	and a
-	ret
-
-.pressed_button
-; high bits of wJumptableIndex are recycled for some flags
-	ld hl, wJumptableIndex
-	set 6, [hl]
-
-.finish
-	callfar ClearSpriteAnims
-	call ClearTilemap
-	call ClearSprites
-
-	ld c, 16
-	call DelayFrames
-
-	scf
-	ret
-
-PlaceGameFreakPresents:
-	jumptable .scenes, wJumptableIndex
-
-.scenes
-	dw GameFreakPresents_Star
-	dw GameFreakPresents_PlaceLogo
-	dw GameFreakPresents_LogoSparkles
-	dw GameFreakPresents_PlacePresents
-	dw GameFreakPresents_WaitForTimer
-	dw GameFreakPresents_SetDoneFlag
-
-GameFreakPresents_NextScene:
-	ld hl, wJumptableIndex
-	inc [hl]
-	ret
-
-Functione4a8d: ; unreferenced
-	ld c, 64
-	call DelayFrames
-	call GameFreakPresents_NextScene
-	ret
-
-GameFreakPresents_Star:
-; tell GameFreakPresents_PlaceLogo we haven't finished yet
-	xor a
-	ld [wIntroSceneFrameCounter], a
-
-	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_GS_INTRO_STAR
-	call InitSpriteAnimStruct
-
-	ld hl, SPRITEANIMSTRUCT_0C
-	add hl, bc
-	ld [hl], $80
-
-	ld de, SFX_GAME_FREAK_LOGO_GS
-	call PlaySFX
-
-	call GameFreakPresents_NextScene
-	ret
-
-GameFreakPresents_PlaceLogo:
-; Draw the Game Freak logo (may be initially invisible due to palette)
-
-; wait until the star animation completed
-; this counter is set in DoAnimFrame.GSIntroStar in engine/gfx/sprite_anims.asm
-	ld a, [wIntroSceneFrameCounter]
-	and a
-	ret z
-
-	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
-	call InitSpriteAnimStruct
-
-	call GameFreakPresents_NextScene
-
-; set timer for GameFreakPresents_LogoSparkles
-	ld a, $80
-	ld [wIntroSceneTimer], a
-	ret
-
-GameFreakPresents_LogoSparkles:
-	ld hl, wIntroSceneTimer
-	ld a, [hl]
-	and a
-	jr z, .done
-	dec [hl]
-
-; add first text when timer passes half
-	cp $3f
-	call z, GameFreakPresents_PlaceGameFreak
-
-; add sparkles continuously
-	call GameFreakPresents_Sparkle
-	ret
-
-.done
-; set timer for GameFreakPresents_PlacePresents
-	ld [hl], $80
-	call GameFreakPresents_NextScene
-	ret
-
-GameFreakPresents_PlaceGameFreak:
-	hlcoord 5, 12
-	ld de, .game_freak
-	call PlaceString
-	ret
-
-.game_freak
-	db $80, $81, $82, $83, $8d, $84, $85, $83, $81, $86
-	db "@"
-
-GameFreakPresents_PlacePresents:
-	hlcoord 7, 13
-	ld de, .presents
-	call PlaceString
-
-	call GameFreakPresents_NextScene
-
-; set timer for GameFreakPresents_WaitForTimer
-	ld a, $80
-	ld [wIntroSceneTimer], a
-	ret
-
-.presents
-	db $87, $88, $89, $8a, $8b, $8c
-	db "@"
-
-GameFreakPresents_SetDoneFlag:
-; Tell GameFreakPresents_PlayFrame and TitleScreenFrame that we're finished.
-
-	ld hl, wJumptableIndex
-	set 7, [hl]
-	ret
-
-GameFreakPresents_WaitForTimer:
-	ld hl, wIntroSceneTimer
-	ld a, [hl]
-	and a
-	jr z, .done
-	dec [hl]
-	ret
-.done
-	call GameFreakPresents_NextScene
-	ret
-
-GameFreakPresents_UpdateLogoPal:
-; called from DoAnimFrame.GameFreakLogo
-; OBP1 was initialized at end of GameFreakPresents_Init
-
-; once we reached the final state, leave it alone
-	ldh a, [rOBP1]
-	cp %10010000
-	ret z
-
-; wait 16 frames before next change
-	ld a, [wIntroSceneTimer]
-	and $f
-	ret nz
-
-; rotate OBP1 by one color slot (2 bits)
-; DMG: logo is white, then light gray, then dark gray
-; CGB: logo is white, then yellow
-	ldh a, [rOBP1]
-	rrca
-	rrca
-	call DmgToCgbObjPal1
-	ret
-
-GameFreakPresents_Sparkle:
-; Initialize and configure a sparkle sprite.
-
-; run only every second frame
-	ld d, a
-	and 1
-	ret nz
-
-; shift over so our index is still changing by 1 each time
-	ld a, d
-	srl a
-
-; set up a new sparkle sprite
-	push af
-	depixel 11, 11
-	ld a, SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
-	call InitSpriteAnimStruct
-	pop af
-
-; take the bottom 4 bits of a as an index into
-; sparkle_vectors (16 entries)
-	and %00001111
-	ld e, a
-	ld d, 0
-	ld hl, .sparkle_vectors
-	add hl, de
-	add hl, de
-
-; set the angle and distance for this sprite
-	ld e, l
-	ld d, h
-	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
-	add hl, bc
-	ld a, [de]
-	ld [hl], a ; angle
-	inc de
-	ld hl, SPRITEANIMSTRUCT_0C
-	add hl, bc
-	ld [hl], 0
-	inc hl ; SPRITEANIMSTRUCT_0D
-	ld a, [de]
-	ld [hl], a ; distance
-	ret
-
-.sparkle_vectors
-; values control final position of each sparkle
-; position is automatically animated along the vector
-; each entry emits two sparkles in opposite directions
-; angle (6 bits) and distance (tiles?)
-	db $00, $03
-	db $08, $04
-	db $04, $03
-	db $0c, $02
-	db $10, $02
-	db $18, $03
-	db $14, $04
-	db $1c, $03
-	db $20, $02
-	db $28, $02
-	db $24, $03
-	db $2c, $04
-	db $30, $04
-	db $38, $03
-	db $34, $02
-	db $3c, $04
-
-GameFreakPresentsGFX1:
-INCBIN "gfx/intro/gamefreak_presents.1bpp"
-INCBIN "gfx/intro/gamefreak_logo.1bpp"
-
-GameFreakPresentsGFX2:
-INCBIN "gfx/intro/logo_star.2bpp"
-INCBIN "gfx/intro/logo_sparkle.2bpp"
-
-
 GoldSilverIntro:
 	call .Init
 .Loop:
diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm
new file mode 100644
index 00000000..903ec4ea
--- /dev/null
+++ b/engine/movie/splash.asm
@@ -0,0 +1,344 @@
+SplashScreen:
+; Play the copyright screen and GameFreak Presents sequence.
+; Return carry if user cancels animation by pressing a button.
+
+; Reinitialize everything
+	call ClearBGPalettes
+	call ClearTilemap
+	ld a, HIGH(vBGMap0)
+	ldh [hBGMapAddress + 1], a
+	xor a ; LOW(vBGMap0)
+	ldh [hBGMapAddress], a
+	ldh [hJoyDown], a
+	ldh [hSCX], a
+	ldh [hSCY], a
+	ld a, SCREEN_HEIGHT_PX
+	ldh [hWY], a
+	call WaitBGMap
+	ld b, SCGB_GAMEFREAK_LOGO
+	call GetSGBLayout
+	call SetPalettes
+	ld c, 10
+	call DelayFrames
+
+; Draw copyright screen
+	callfar Copyright
+	call WaitBGMap
+	ld c, 100
+	call DelayFrames
+	call ClearTilemap
+
+; Play GameFreak logo animation
+	call GameFreakPresentsInit
+.loop
+	call GameFreakPresentsFrame
+	jr nc, .loop
+
+; high bits of wJumptableIndex are recycled for some flags
+; this was set if user canceled by pressing a button
+	ld a, [wJumptableIndex]
+	bit 6, a
+	jr nz, .canceled
+
+; clear carry flag from GameFreakPresents_PlayFrame
+	and a
+	ret
+
+.canceled
+	scf
+	ret
+
+GameFreakPresentsInit:
+	ld de, GameFreakLogoGFX
+	ld hl, vTiles1
+	lb bc, BANK(GameFreakLogoGFX), 28
+	call Get1bpp
+
+	ld de, GameFreakLogoStarsGFX
+	ld hl, vTiles1 tile 28
+	lb bc, BANK(GameFreakLogoStarsGFX), 5
+	call Request2bpp
+
+	farcall ClearSpriteAnims
+
+	ld hl, wSpriteAnimDict
+	ld a, 6
+	ld [hli], a
+	ld a, $8d
+	ld [hl], a
+	xor a
+	ld [wJumptableIndex], a
+	ld [wIntroSceneFrameCounter], a
+	ld [wIntroSceneTimer], a
+	ldh [hSCX], a
+	ldh [hSCY], a
+	ld a, 1
+	ldh [hBGMapMode], a
+	ld a, SCREEN_HEIGHT_PX
+	ldh [hWY], a
+	lb de, %00100100, %11111000
+	call DmgToCgbObjPals
+	ret
+
+GameFreakPresentsFrame:
+; Play one frame of GameFreakPresents sequence.
+; Return carry when the sequence completes or is canceled.
+
+	call JoyTextDelay
+	ldh a, [hJoyLast]
+	and BUTTONS
+	jr nz, .pressed_button
+
+; high bits of wJumptableIndex are recycled for some flags
+; this is set when the sequence finished
+	ld a, [wJumptableIndex]
+	bit 7, a
+	jr nz, .finish
+
+	farcall PlaySpriteAnimations
+
+	call GameFreakPresentsScene
+	call DelayFrame
+
+; ensure carry is cleared
+	and a
+	ret
+
+.pressed_button
+; high bits of wJumptableIndex are recycled for some flags
+	ld hl, wJumptableIndex
+	set 6, [hl]
+
+.finish
+	callfar ClearSpriteAnims
+	call ClearTilemap
+	call ClearSprites
+
+	ld c, 16
+	call DelayFrames
+
+	scf
+	ret
+
+GameFreakPresentsScene:
+	jumptable .scenes, wJumptableIndex
+
+.scenes
+	dw GameFreakPresents_Star
+	dw GameFreakPresents_PlaceLogo
+	dw GameFreakPresents_LogoSparkles
+	dw GameFreakPresents_PlacePresents
+	dw GameFreakPresents_WaitForTimer
+	dw GameFreakPresents_SetDoneFlag
+
+GameFreakPresents_NextScene:
+	ld hl, wJumptableIndex
+	inc [hl]
+	ret
+
+Functione4a8d: ; unreferenced
+	ld c, 64
+	call DelayFrames
+	call GameFreakPresents_NextScene
+	ret
+
+GameFreakPresents_Star:
+; tell GameFreakPresents_PlaceLogo we haven't finished yet
+	xor a
+	ld [wIntroSceneFrameCounter], a
+
+	depixel 10, 11, 4, 0
+	ld a, SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR
+	call InitSpriteAnimStruct
+
+	ld hl, SPRITEANIMSTRUCT_VAR1
+	add hl, bc
+	ld [hl], $80
+
+	ld de, SFX_GAME_FREAK_LOGO_GS
+	call PlaySFX
+
+	call GameFreakPresents_NextScene
+	ret
+
+GameFreakPresents_PlaceLogo:
+; Draw the Game Freak logo (may be initially invisible due to palette)
+
+; wait until the star animation completed
+; this counter is set in DoAnimFrame.GSIntroStar in engine/gfx/sprite_anims.asm
+	ld a, [wIntroSceneFrameCounter]
+	and a
+	ret z
+
+	depixel 10, 11, 4, 0
+	ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	call InitSpriteAnimStruct
+
+	call GameFreakPresents_NextScene
+
+; set timer for GameFreakPresents_LogoSparkles
+	ld a, 128
+	ld [wIntroSceneTimer], a
+	ret
+
+GameFreakPresents_LogoSparkles:
+	ld hl, wIntroSceneTimer
+	ld a, [hl]
+	and a
+	jr z, .done
+	dec [hl]
+
+; add first text when timer passes half
+	cp 63
+	call z, GameFreakPresents_PlaceGameFreak
+
+; add sparkles continuously
+	call GameFreakPresents_Sparkle
+	ret
+
+.done
+; go to the next scene
+	ld [hl], 128
+	call GameFreakPresents_NextScene
+	ret
+
+GameFreakPresents_PlaceGameFreak:
+	hlcoord 5, 12
+	ld de, .game_freak
+	call PlaceString
+	ret
+
+.game_freak
+	db $80, $81, $82, $83, $8d, $84, $85, $83, $81, $86
+	db "@"
+
+GameFreakPresents_PlacePresents:
+	hlcoord 7, 13
+	ld de, .presents
+	call PlaceString
+
+	call GameFreakPresents_NextScene
+
+; set timer for GameFreakPresents_WaitForTimer
+	ld a, 128
+	ld [wIntroSceneTimer], a
+	ret
+
+.presents
+	db $87, $88, $89, $8a, $8b, $8c
+	db "@"
+
+GameFreakPresents_SetDoneFlag:
+; Tell GameFreakPresents_PlayFrame and TitleScreenFrame that we're finished.
+
+	ld hl, wJumptableIndex
+	set 7, [hl]
+	ret
+
+GameFreakPresents_WaitForTimer:
+	ld hl, wIntroSceneTimer
+	ld a, [hl]
+	and a
+	jr z, .done
+	dec [hl]
+	ret
+.done
+	call GameFreakPresents_NextScene
+	ret
+
+GameFreakPresents_UpdateLogoPal:
+; called from DoAnimFrame.GameFreakLogo
+; OBP1 was initialized at end of GameFreakPresents_Init
+
+; once we reached the final state, leave it alone
+	ldh a, [rOBP1]
+	cp %10010000
+	ret z
+
+; wait 16 frames before next change
+	ld a, [wIntroSceneTimer]
+	and $f
+	ret nz
+
+; rotate OBP1 by one color slot (2 bits)
+; DMG: logo is white, then light gray, then dark gray
+; CGB: logo is white, then yellow
+	ldh a, [rOBP1]
+	rrca
+	rrca
+	call DmgToCgbObjPal1
+	ret
+
+GameFreakPresents_Sparkle:
+; Initialize and configure a sparkle sprite.
+
+; run only every second frame
+	ld d, a
+	and 1
+	ret nz
+
+; shift over so our index is still changing by 1 each time
+	ld a, d
+	srl a
+
+; set up a new sparkle sprite
+	push af
+	depixel 11, 11
+	ld a, SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE
+	call InitSpriteAnimStruct
+	pop af
+
+; take the bottom 4 bits of a as an index into
+; sparkle_vectors (16 entries)
+	and %00001111
+	ld e, a
+	ld d, 0
+	ld hl, .sparkle_vectors
+	add hl, de
+	add hl, de
+
+; set the angle and distance for this sprite
+	ld e, l
+	ld d, h
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
+	add hl, bc
+	ld a, [de]
+	ld [hl], a ; angle
+	inc de
+	ld hl, SPRITEANIMSTRUCT_VAR1
+	add hl, bc
+	ld [hl], 0
+	inc hl ; SPRITEANIMSTRUCT_VAR2
+	ld a, [de]
+	ld [hl], a ; distance
+	ret
+
+.sparkle_vectors
+; values control final position of each sparkle
+; position is automatically animated along the vector
+; each entry emits two sparkles in opposite directions
+; angle (6 bits) and distance (tiles?)
+	db $00, $03
+	db $08, $04
+	db $04, $03
+	db $0c, $02
+	db $10, $02
+	db $18, $03
+	db $14, $04
+	db $1c, $03
+	db $20, $02
+	db $28, $02
+	db $24, $03
+	db $2c, $04
+	db $30, $04
+	db $38, $03
+	db $34, $02
+	db $3c, $04
+
+GameFreakLogoGFX:
+INCBIN "gfx/splash/gamefreak_presents.1bpp"
+INCBIN "gfx/splash/gamefreak_logo.1bpp"
+
+GameFreakLogoStarsGFX:
+INCBIN "gfx/splash/logo_star.2bpp"
+INCBIN "gfx/splash/logo_sparkle.2bpp"
diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm
index b737380e..6877514a 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -1020,13 +1020,13 @@ TradeAnim_AnimateTrademonInTube:
 
 .InitTimer:
 	call .JumptableNext
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $80
 	ret
 
 .WaitTimer1:
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -1084,13 +1084,13 @@ TradeAnim_AnimateTrademonInTube:
 
 .done_move_left
 	call .JumptableNext
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld [hl], $80
 	ret
 
 .WaitTimer2:
-	ld hl, SPRITEANIMSTRUCT_0C
+	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
 	dec [hl]