shithub: pokecrystal

Download patch

ref: 41618f9e98b9aa04cedaf4b357531fd7fbf15deb
parent: c4e3e980b17456c47374c4e4583731924ae30725
author: PikalaxALT <PikalaxALT@gmail.com>
date: Thu Dec 24 08:33:54 EST 2015

More battle anim object constants

--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -85,9 +85,9 @@
 	call InitBattleAnimBuffer
 	call GetBattleAnimFrame
 	cp -3
-	jp z, .exit_no_carry
+	jp z, .done
 	cp -4
-	jp z, .delete_exit
+	jp z, .delete
 	push af
 	ld hl, wBattleAnimTempOAMFlags
 	ld a, [wBattleAnimTemp7]
@@ -179,12 +179,12 @@
 	dec c
 	jr nz, .loop
 	pop bc
-	jr .exit_no_carry
+	jr .done
 
-.delete_exit
+.delete
 	call DeinitBattleAnimation
 
-.exit_no_carry
+.done
 	and a
 	ret
 
@@ -321,194 +321,194 @@
 	db \1, \2, \3, \4, \5, \6
 endm
 
-	battleanimobj $01, $ff, $00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_00
-	battleanimobj $01, $ff, $01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_01
-	battleanimobj $01, $ff, $02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_02
-	battleanimobj $01, $90, $00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_03
-	battleanimobj $01, $90, $01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_04
-	battleanimobj $01, $90, $02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_05
-	battleanimobj $01, $ff, $03, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_06
-	battleanimobj $01, $ff, $04, BATTLEANIMFUNC_1B, $02, $01 ; ANIM_OBJ_07
-	battleanimobj $01, $ff, $05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_08
-	battleanimobj $01, $ff, $06, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_09
-	battleanimobj $01, $90, $07, BATTLEANIMFUNC_09, $02, $01 ; ANIM_OBJ_0A
-	battleanimobj $01, $aa, $10, BATTLEANIMFUNC_10, $04, $03 ; ANIM_OBJ_0B
-	battleanimobj $01, $90, $0e, BATTLEANIMFUNC_04, $04, $03 ; ANIM_OBJ_0C
-	battleanimobj $01, $90, $0f, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_0D
-	battleanimobj $01, $90, $10, BATTLEANIMFUNC_08, $04, $03 ; ANIM_OBJ_0E
-	battleanimobj $01, $90, $0f, BATTLEANIMFUNC_0A, $04, $03 ; ANIM_OBJ_0F
-	battleanimobj $01, $90, $11, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_BURNED
-	battleanimobj $01, $90, $12, BATTLEANIMFUNC_08, $06, $0a ; ANIM_OBJ_11
-	battleanimobj $01, $90, $13, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_12
-	battleanimobj $01, $90, $14, BATTLEANIMFUNC_01, $06, $0a ; ANIM_OBJ_13
-	battleanimobj $21, $78, $16, BATTLEANIMFUNC_0B, $05, $06 ; ANIM_OBJ_14
-	battleanimobj $00, $00, $09, BATTLEANIMFUNC_12, $04, $0b ; ANIM_OBJ_POKE_BALL
-	battleanimobj $00, $00, $09, BATTLEANIMFUNC_13, $04, $0b ; ANIM_OBJ_16
-	battleanimobj $01, $90, $18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_17
-	battleanimobj $01, $ff, $18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_18
-	battleanimobj $01, $90, $1d, BATTLEANIMFUNC_06, $02, $0c ; ANIM_OBJ_19
-	battleanimobj $01, $b4, $1f, BATTLEANIMFUNC_38, $02, $0c ; ANIM_OBJ_1A
-	battleanimobj $01, $90, $08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1B
-	battleanimobj $01, $a0, $08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1C
-	battleanimobj $01, $ff, $19, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1D
-	battleanimobj $01, $ff, $1a, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1E
-	battleanimobj $01, $b0, $1b, BATTLEANIMFUNC_36, $07, $09 ; ANIM_OBJ_1F
-	battleanimobj $01, $b0, $84, BATTLEANIMFUNC_36, $06, $21 ; ANIM_OBJ_20
-	battleanimobj $01, $90, $21, BATTLEANIMFUNC_0C, $06, $0d ; ANIM_OBJ_21
-	battleanimobj $00, $00, $23, BATTLEANIMFUNC_0D, $06, $0d ; ANIM_OBJ_22
-	battleanimobj $01, $90, $24, BATTLEANIMFUNC_0E, $02, $0e ; ANIM_OBJ_23
-	battleanimobj $61, $80, $27, BATTLEANIMFUNC_0F, $06, $04 ; ANIM_OBJ_24
-	battleanimobj $01, $b4, $2a, BATTLEANIMFUNC_00, $06, $04 ; ANIM_OBJ_25
-	battleanimobj $01, $40, $2b, BATTLEANIMFUNC_11, $05, $0f ; ANIM_OBJ_26
-	battleanimobj $61, $98, $2c, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_27
-	battleanimobj $61, $98, $2d, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_28
-	battleanimobj $01, $b8, $2e, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_29
-	battleanimobj $01, $b8, $2f, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_FROZEN
-	battleanimobj $01, $b8, $30, BATTLEANIMFUNC_14, $07, $11 ; ANIM_OBJ_2B
-	battleanimobj $01, $90, $21, BATTLEANIMFUNC_14, $03, $0d ; ANIM_OBJ_2C
-	battleanimobj $21, $b0, $31, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2D
-	battleanimobj $21, $b0, $32, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2E
-	battleanimobj $21, $b0, $33, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2F
-	battleanimobj $21, $90, $34, BATTLEANIMFUNC_15, $03, $05 ; ANIM_OBJ_30
-	battleanimobj $21, $90, $36, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_31
-	battleanimobj $21, $90, $37, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_32
-	battleanimobj $21, $90, $38, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_33
-	battleanimobj $21, $90, $39, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_34
-	battleanimobj $21, $90, $3a, BATTLEANIMFUNC_16, $02, $02 ; ANIM_OBJ_35
-	battleanimobj $01, $90, $3c, BATTLEANIMFUNC_17, $02, $02 ; ANIM_OBJ_36
-	battleanimobj $21, $ff, $3e, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_37
-	battleanimobj $21, $ff, $3f, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_38
-	battleanimobj $21, $ff, $40, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_39
-	battleanimobj $21, $ff, $41, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3A
-	battleanimobj $21, $ff, $42, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3B
-	battleanimobj $01, $88, $43, BATTLEANIMFUNC_18, $05, $12 ; ANIM_OBJ_3C
-	battleanimobj $01, $88, $44, BATTLEANIMFUNC_00, $05, $12 ; ANIM_OBJ_3D
-	battleanimobj $21, $b8, $45, BATTLEANIMFUNC_19, $02, $13 ; ANIM_OBJ_GUST
-	battleanimobj $21, $ff, $46, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_3F
-	battleanimobj $21, $ff, $47, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_40
-	battleanimobj $21, $ff, $48, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_41
-	battleanimobj $21, $ff, $49, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_42
-	battleanimobj $21, $98, $4a, BATTLEANIMFUNC_01, $02, $14 ; ANIM_OBJ_43
-	battleanimobj $21, $80, $4b, BATTLEANIMFUNC_00, $03, $11 ; ANIM_OBJ_44
-	battleanimobj $01, $88, $4c, BATTLEANIMFUNC_1C, $05, $12 ; ANIM_OBJ_45
-	battleanimobj $21, $b0, $4d, BATTLEANIMFUNC_1D, $02, $15 ; ANIM_OBJ_46
-	battleanimobj $01, $b0, $51, BATTLEANIMFUNC_1E, $03, $11 ; ANIM_OBJ_47
-	battleanimobj $21, $ff, $52, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_48
-	battleanimobj $21, $ff, $54, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_49
-	battleanimobj $21, $68, $56, BATTLEANIMFUNC_20, $05, $06 ; ANIM_OBJ_4A
-	battleanimobj $21, $90, $59, BATTLEANIMFUNC_21, $02, $0e ; ANIM_OBJ_4B
-	battleanimobj $21, $90, $5c, BATTLEANIMFUNC_02, $02, $17 ; ANIM_OBJ_4C
-	battleanimobj $01, $90, $5d, BATTLEANIMFUNC_22, $03, $11 ; ANIM_OBJ_4D
-	battleanimobj $61, $88, $5f, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_4E
-	battleanimobj $61, $88, $2d, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_4F
-	battleanimobj $21, $88, $60, BATTLEANIMFUNC_00, $03, $18 ; ANIM_OBJ_50
-	battleanimobj $21, $80, $60, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_51
-	battleanimobj $21, $50, $61, BATTLEANIMFUNC_23, $03, $19 ; ANIM_OBJ_CHICK
-	battleanimobj $01, $80, $63, BATTLEANIMFUNC_24, $02, $19 ; ANIM_OBJ_53
-	battleanimobj $01, $80, $66, BATTLEANIMFUNC_25, $02, $19 ; ANIM_OBJ_54
-	battleanimobj $01, $50, $1c, BATTLEANIMFUNC_00, $02, $0c ; ANIM_OBJ_SKULL
-	battleanimobj $21, $a8, $67, BATTLEANIMFUNC_26, $07, $1a ; ANIM_OBJ_56
-	battleanimobj $21, $a8, $68, BATTLEANIMFUNC_00, $07, $1a ; ANIM_OBJ_57
-	battleanimobj $21, $90, $69, BATTLEANIMFUNC_01, $02, $1a ; ANIM_OBJ_58
-	battleanimobj $21, $90, $6d, BATTLEANIMFUNC_28, $03, $19 ; ANIM_OBJ_PARALYZED
-	battleanimobj $21, $90, $6a, BATTLEANIMFUNC_27, $02, $1b ; ANIM_OBJ_5A
-	battleanimobj $00, $00, $6f, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5B
-	battleanimobj $21, $48, $70, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5C
-	battleanimobj $21, $48, $6f, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5D
-	battleanimobj $21, $78, $6f, BATTLEANIMFUNC_2A, $02, $1c ; ANIM_OBJ_5E
-	battleanimobj $61, $90, $71, BATTLEANIMFUNC_2B, $02, $1d ; ANIM_OBJ_5F
-	battleanimobj $61, $90, $72, BATTLEANIMFUNC_2C, $02, $1d ; ANIM_OBJ_60
-	battleanimobj $01, $48, $73, BATTLEANIMFUNC_2D, $04, $1e ; ANIM_OBJ_61
-	battleanimobj $01, $90, $74, BATTLEANIMFUNC_06, $02, $15 ; ANIM_OBJ_62
-	battleanimobj $01, $ff, $75, BATTLEANIMFUNC_2E, $07, $19 ; ANIM_OBJ_63
-	battleanimobj $21, $90, $4a, BATTLEANIMFUNC_02, $02, $14 ; ANIM_OBJ_64
-	battleanimobj $01, $80, $30, BATTLEANIMFUNC_2F, $02, $11 ; ANIM_OBJ_65
-	battleanimobj $01, $78, $76, BATTLEANIMFUNC_2A, $04, $23 ; ANIM_OBJ_66
-	battleanimobj $01, $80, $77, BATTLEANIMFUNC_30, $02, $1f ; ANIM_OBJ_67
-	battleanimobj $01, $90, $77, BATTLEANIMFUNC_02, $02, $1f ; ANIM_OBJ_68
-	battleanimobj $01, $ff, $77, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_69
-	battleanimobj $01, $80, $78, BATTLEANIMFUNC_08, $03, $23 ; ANIM_OBJ_6A
-	battleanimobj $21, $90, $79, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_6B
-	battleanimobj $01, $ff, $7a, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6C
-	battleanimobj $01, $88, $7a, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6D
-	battleanimobj $21, $88, $7b, BATTLEANIMFUNC_32, $02, $20 ; ANIM_OBJ_6E
-	battleanimobj $21, $98, $7c, BATTLEANIMFUNC_00, $02, $04 ; ANIM_OBJ_6F
-	battleanimobj $21, $80, $7d, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_70
-	battleanimobj $01, $80, $21, BATTLEANIMFUNC_2F, $06, $0d ; ANIM_OBJ_71
-	battleanimobj $01, $b0, $7e, BATTLEANIMFUNC_33, $03, $12 ; ANIM_OBJ_72
-	battleanimobj $01, $80, $7f, BATTLEANIMFUNC_2F, $02, $08 ; ANIM_OBJ_73
-	battleanimobj $21, $a0, $6f, BATTLEANIMFUNC_34, $02, $1c ; ANIM_OBJ_74
-	battleanimobj $21, $a0, $74, BATTLEANIMFUNC_35, $02, $15 ; ANIM_OBJ_75
-	battleanimobj $21, $b0, $80, BATTLEANIMFUNC_33, $02, $14 ; ANIM_OBJ_76
-	battleanimobj $01, $88, $81, BATTLEANIMFUNC_37, $02, $11 ; ANIM_OBJ_77
-	battleanimobj $01, $88, $85, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_78
-	battleanimobj $01, $88, $86, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_79
-	battleanimobj $01, $90, $87, BATTLEANIMFUNC_39, $02, $1f ; ANIM_OBJ_7A
-	battleanimobj $01, $80, $30, BATTLEANIMFUNC_3A, $03, $11 ; ANIM_OBJ_7B
-	battleanimobj $21, $90, $34, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_7C
-	battleanimobj $a1, $88, $88, BATTLEANIMFUNC_3B, $06, $13 ; ANIM_OBJ_7D
-	battleanimobj $01, $80, $76, BATTLEANIMFUNC_25, $04, $23 ; ANIM_OBJ_HEART
-	battleanimobj $01, $98, $10, BATTLEANIMFUNC_34, $04, $03 ; ANIM_OBJ_7F
-	battleanimobj $01, $a8, $0f, BATTLEANIMFUNC_3C, $04, $03 ; ANIM_OBJ_80
-	battleanimobj $21, $68, $89, BATTLEANIMFUNC_29, $02, $1f ; ANIM_OBJ_81
-	battleanimobj $21, $b0, $8a, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_82
-	battleanimobj $21, $80, $8c, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_83
-	battleanimobj $21, $50, $8d, BATTLEANIMFUNC_00, $03, $1f ; ANIM_OBJ_84
-	battleanimobj $01, $40, $24, BATTLEANIMFUNC_40, $02, $0e ; ANIM_OBJ_85
-	battleanimobj $21, $a8, $8e, BATTLEANIMFUNC_41, $04, $1f ; ANIM_OBJ_86
-	battleanimobj $21, $88, $8f, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_87
-	battleanimobj $21, $88, $93, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_88
-	battleanimobj $21, $90, $97, BATTLEANIMFUNC_3D, $02, $1f ; ANIM_OBJ_89
-	battleanimobj $21, $90, $78, BATTLEANIMFUNC_3D, $03, $23 ; ANIM_OBJ_8A
-	battleanimobj $01, $ff, $99, BATTLEANIMFUNC_2E, $02, $19 ; ANIM_OBJ_8B
-	battleanimobj $21, $a0, $74, BATTLEANIMFUNC_02, $02, $15 ; ANIM_OBJ_8C
-	battleanimobj $21, $a0, $99, BATTLEANIMFUNC_35, $04, $19 ; ANIM_OBJ_8D
-	battleanimobj $21, $70, $8b, BATTLEANIMFUNC_3F, $02, $1f ; ANIM_OBJ_8E
-	battleanimobj $01, $90, $15, BATTLEANIMFUNC_08, $02, $0a ; ANIM_OBJ_8F
-	battleanimobj $01, $90, $11, BATTLEANIMFUNC_02, $04, $03 ; ANIM_OBJ_90
-	battleanimobj $01, $80, $7f, BATTLEANIMFUNC_42, $02, $08 ; ANIM_OBJ_91
-	battleanimobj $01, $90, $9a, BATTLEANIMFUNC_00, $02, $1b ; ANIM_OBJ_92
-	battleanimobj $21, $a0, $9b, BATTLEANIMFUNC_35, $04, $23 ; ANIM_OBJ_93
-	battleanimobj $21, $80, $9c, BATTLEANIMFUNC_23, $02, $25 ; ANIM_OBJ_94
-	battleanimobj $21, $80, $9d, BATTLEANIMFUNC_25, $02, $25 ; ANIM_OBJ_95
-	battleanimobj $21, $80, $9c, BATTLEANIMFUNC_00, $02, $25 ; ANIM_OBJ_96
-	battleanimobj $21, $80, $9e, BATTLEANIMFUNC_00, $06, $25 ; ANIM_OBJ_97
-	battleanimobj $61, $80, $9f, BATTLEANIMFUNC_3A, $05, $23 ; ANIM_OBJ_98
-	battleanimobj $21, $80, $a0, BATTLEANIMFUNC_16, $02, $23 ; ANIM_OBJ_99
-	battleanimobj $21, $70, $78, BATTLEANIMFUNC_43, $03, $23 ; ANIM_OBJ_9A
-	battleanimobj $21, $c0, $a2, BATTLEANIMFUNC_01, $02, $25 ; ANIM_OBJ_9B
-	battleanimobj $21, $40, $a3, BATTLEANIMFUNC_44, $03, $24 ; ANIM_OBJ_9C
-	battleanimobj $01, $80, $a4, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_9D
-	battleanimobj $01, $80, $a5, BATTLEANIMFUNC_00, $03, $24 ; ANIM_OBJ_9E
-	battleanimobj $01, $88, $43, BATTLEANIMFUNC_45, $04, $12 ; ANIM_OBJ_9F
-	battleanimobj $21, $ff, $a6, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A0
-	battleanimobj $21, $ff, $a7, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A1
-	battleanimobj $21, $00, $b4, BATTLEANIMFUNC_4A, $07, $0f ; ANIM_OBJ_A2
-	battleanimobj $21, $90, $a8, BATTLEANIMFUNC_02, $03, $05 ; ANIM_OBJ_A3
-	battleanimobj $21, $40, $9c, BATTLEANIMFUNC_11, $02, $25 ; ANIM_OBJ_A4
-	battleanimobj $61, $90, $a9, BATTLEANIMFUNC_46, $02, $23 ; ANIM_OBJ_A5
-	battleanimobj $00, $00, $24, BATTLEANIMFUNC_47, $02, $0e ; ANIM_OBJ_A6
-	battleanimobj $01, $80, $aa, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_A7
-	battleanimobj $21, $b8, $ab, BATTLEANIMFUNC_48, $02, $13 ; ANIM_OBJ_A8
-	battleanimobj $21, $90, $ac, BATTLEANIMFUNC_44, $02, $13 ; ANIM_OBJ_A9
-	battleanimobj $01, $a8, $05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_AA
-	battleanimobj $01, $90, $24, BATTLEANIMFUNC_43, $02, $0e ; ANIM_OBJ_AB
-	battleanimobj $01, $88, $ad, BATTLEANIMFUNC_00, $06, $17 ; ANIM_OBJ_AC
-	battleanimobj $01, $a8, $ae, BATTLEANIMFUNC_49, $02, $01 ; ANIM_OBJ_AD
-	battleanimobj $21, $90, $af, BATTLEANIMFUNC_01, $03, $11 ; ANIM_OBJ_AE
-	battleanimobj $21, $00, $b0, BATTLEANIMFUNC_4A, $02, $04 ; ANIM_OBJ_AF
-	battleanimobj $00, $00, $70, BATTLEANIMFUNC_4B, $04, $1c ; ANIM_OBJ_B0
-	battleanimobj $01, $88, $b1, BATTLEANIMFUNC_4C, $02, $19 ; ANIM_OBJ_B1
-	battleanimobj $01, $b8, $19, BATTLEANIMFUNC_4D, $07, $09 ; ANIM_OBJ_B2
-	battleanimobj $61, $98, $b3, BATTLEANIMFUNC_00, $03, $27 ; ANIM_OBJ_B3
-	battleanimobj $61, $98, $74, BATTLEANIMFUNC_04, $06, $15 ; ANIM_OBJ_B4
-	battleanimobj $21, $ff, $19, BATTLEANIMFUNC_4E, $07, $09 ; ANIM_OBJ_B5
-	battleanimobj $01, $90, $73, BATTLEANIMFUNC_08, $04, $1e ; ANIM_OBJ_FLOWER
-	battleanimobj $01, $ff, $89, BATTLEANIMFUNC_4F, $04, $1f ; ANIM_OBJ_COTTON
-	battleanimobj $00, $00, $b5, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_B8
-	battleanimobj $00, $00, $b6, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_B9
-	battleanimobj $00, $00, $b7, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_BA
-	battleanimobj $00, $00, $b8, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_BB
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_00
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_01
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_02
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_03
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_04
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_05
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_03, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_06
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_04, BATTLEANIMFUNC_1B, $02, $01 ; ANIM_OBJ_07
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_08
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_06, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_09
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_07, BATTLEANIMFUNC_09, $02, $01 ; ANIM_OBJ_0A
+	battleanimobj $01, $aa, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_10, $04, $03 ; ANIM_OBJ_0B
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_0E, BATTLEANIMFUNC_04, $04, $03 ; ANIM_OBJ_0C
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_0D
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_08, $04, $03 ; ANIM_OBJ_0E
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_0A, $04, $03 ; ANIM_OBJ_0F
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_BURNED
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, $06, $0a ; ANIM_OBJ_11
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_12
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, $06, $0a ; ANIM_OBJ_13
+	battleanimobj $21, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_0B, $05, $06 ; ANIM_OBJ_14
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, $04, $0b ; ANIM_OBJ_POKE_BALL
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, $04, $0b ; ANIM_OBJ_16
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_17
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_18
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_1D, BATTLEANIMFUNC_06, $02, $0c ; ANIM_OBJ_19
+	battleanimobj $01, $b4, BATTLEANIMFRAMESET_1F, BATTLEANIMFUNC_38, $02, $0c ; ANIM_OBJ_1A
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1B
+	battleanimobj $01, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1C
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1D
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_1A, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1E
+	battleanimobj $01, $b0, BATTLEANIMFRAMESET_1B, BATTLEANIMFUNC_36, $07, $09 ; ANIM_OBJ_1F
+	battleanimobj $01, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, $06, $21 ; ANIM_OBJ_20
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, $06, $0d ; ANIM_OBJ_21
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_23, BATTLEANIMFUNC_0D, $06, $0d ; ANIM_OBJ_22
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_0E, $02, $0e ; ANIM_OBJ_23
+	battleanimobj $61, $80, BATTLEANIMFRAMESET_27, BATTLEANIMFUNC_0F, $06, $04 ; ANIM_OBJ_24
+	battleanimobj $01, $b4, BATTLEANIMFRAMESET_2A, BATTLEANIMFUNC_00, $06, $04 ; ANIM_OBJ_25
+	battleanimobj $01, $40, BATTLEANIMFRAMESET_2B, BATTLEANIMFUNC_11, $05, $0f ; ANIM_OBJ_26
+	battleanimobj $61, $98, BATTLEANIMFRAMESET_2C, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_27
+	battleanimobj $61, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_28
+	battleanimobj $01, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_29
+	battleanimobj $01, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_FROZEN
+	battleanimobj $01, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, $07, $11 ; ANIM_OBJ_2B
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_14, $03, $0d ; ANIM_OBJ_2C
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_31, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2D
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_32, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2E
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_33, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2F
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_15, $03, $05 ; ANIM_OBJ_30
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_31
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_32
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_38, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_33
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_39, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_34
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_3A, BATTLEANIMFUNC_16, $02, $02 ; ANIM_OBJ_35
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_3C, BATTLEANIMFUNC_17, $02, $02 ; ANIM_OBJ_36
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_3E, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_37
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_3F, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_38
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_40, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_39
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_41, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3A
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_42, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3B
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_18, $05, $12 ; ANIM_OBJ_3C
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_44, BATTLEANIMFUNC_00, $05, $12 ; ANIM_OBJ_3D
+	battleanimobj $21, $b8, BATTLEANIMFRAMESET_45, BATTLEANIMFUNC_19, $02, $13 ; ANIM_OBJ_GUST
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_46, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_3F
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_47, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_40
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_48, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_41
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_49, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_42
+	battleanimobj $21, $98, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_01, $02, $14 ; ANIM_OBJ_43
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, $03, $11 ; ANIM_OBJ_44
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, $05, $12 ; ANIM_OBJ_45
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_1D, $02, $15 ; ANIM_OBJ_46
+	battleanimobj $01, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_1E, $03, $11 ; ANIM_OBJ_47
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_48
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_49
+	battleanimobj $21, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_20, $05, $06 ; ANIM_OBJ_4A
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, $02, $0e ; ANIM_OBJ_4B
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_5C, BATTLEANIMFUNC_02, $02, $17 ; ANIM_OBJ_4C
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_5D, BATTLEANIMFUNC_22, $03, $11 ; ANIM_OBJ_4D
+	battleanimobj $61, $88, BATTLEANIMFRAMESET_5F, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_4E
+	battleanimobj $61, $88, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_4F
+	battleanimobj $21, $88, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, $03, $18 ; ANIM_OBJ_50
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_51
+	battleanimobj $21, $50, BATTLEANIMFRAMESET_61, BATTLEANIMFUNC_23, $03, $19 ; ANIM_OBJ_CHICK
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_63, BATTLEANIMFUNC_24, $02, $19 ; ANIM_OBJ_53
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_66, BATTLEANIMFUNC_25, $02, $19 ; ANIM_OBJ_54
+	battleanimobj $01, $50, BATTLEANIMFRAMESET_1C, BATTLEANIMFUNC_00, $02, $0c ; ANIM_OBJ_SKULL
+	battleanimobj $21, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_26, $07, $1a ; ANIM_OBJ_56
+	battleanimobj $21, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_00, $07, $1a ; ANIM_OBJ_57
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_69, BATTLEANIMFUNC_01, $02, $1a ; ANIM_OBJ_58
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_6D, BATTLEANIMFUNC_28, $03, $19 ; ANIM_OBJ_PARALYZED
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, $02, $1b ; ANIM_OBJ_5A
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5B
+	battleanimobj $21, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5C
+	battleanimobj $21, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5D
+	battleanimobj $21, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_2A, $02, $1c ; ANIM_OBJ_5E
+	battleanimobj $61, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_2B, $02, $1d ; ANIM_OBJ_5F
+	battleanimobj $61, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, $02, $1d ; ANIM_OBJ_60
+	battleanimobj $01, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_2D, $04, $1e ; ANIM_OBJ_61
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_06, $02, $15 ; ANIM_OBJ_62
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_2E, $07, $19 ; ANIM_OBJ_63
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_02, $02, $14 ; ANIM_OBJ_64
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, $02, $11 ; ANIM_OBJ_65
+	battleanimobj $01, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_2A, $04, $23 ; ANIM_OBJ_66
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, $02, $1f ; ANIM_OBJ_67
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_02, $02, $1f ; ANIM_OBJ_68
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_69
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_08, $03, $23 ; ANIM_OBJ_6A
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_6B
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6C
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6D
+	battleanimobj $21, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, $02, $20 ; ANIM_OBJ_6E
+	battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04 ; ANIM_OBJ_6F
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_70
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_2F, $06, $0d ; ANIM_OBJ_71
+	battleanimobj $01, $b0, BATTLEANIMFRAMESET_7E, BATTLEANIMFUNC_33, $03, $12 ; ANIM_OBJ_72
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_2F, $02, $08 ; ANIM_OBJ_73
+	battleanimobj $21, $a0, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_34, $02, $1c ; ANIM_OBJ_74
+	battleanimobj $21, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_35, $02, $15 ; ANIM_OBJ_75
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_80, BATTLEANIMFUNC_33, $02, $14 ; ANIM_OBJ_76
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_81, BATTLEANIMFUNC_37, $02, $11 ; ANIM_OBJ_77
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_85, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_78
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_86, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_79
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_87, BATTLEANIMFUNC_39, $02, $1f ; ANIM_OBJ_7A
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_3A, $03, $11 ; ANIM_OBJ_7B
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_7C
+	battleanimobj $a1, $88, BATTLEANIMFRAMESET_88, BATTLEANIMFUNC_3B, $06, $13 ; ANIM_OBJ_7D
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_25, $04, $23 ; ANIM_OBJ_HEART
+	battleanimobj $01, $98, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_34, $04, $03 ; ANIM_OBJ_7F
+	battleanimobj $01, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, $04, $03 ; ANIM_OBJ_80
+	battleanimobj $21, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_29, $02, $1f ; ANIM_OBJ_81
+	battleanimobj $21, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_82
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_8C, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_83
+	battleanimobj $21, $50, BATTLEANIMFRAMESET_8D, BATTLEANIMFUNC_00, $03, $1f ; ANIM_OBJ_84
+	battleanimobj $01, $40, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_40, $02, $0e ; ANIM_OBJ_85
+	battleanimobj $21, $a8, BATTLEANIMFRAMESET_8E, BATTLEANIMFUNC_41, $04, $1f ; ANIM_OBJ_86
+	battleanimobj $21, $88, BATTLEANIMFRAMESET_8F, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_87
+	battleanimobj $21, $88, BATTLEANIMFRAMESET_93, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_88
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_97, BATTLEANIMFUNC_3D, $02, $1f ; ANIM_OBJ_89
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_3D, $03, $23 ; ANIM_OBJ_8A
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_2E, $02, $19 ; ANIM_OBJ_8B
+	battleanimobj $21, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_02, $02, $15 ; ANIM_OBJ_8C
+	battleanimobj $21, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, $04, $19 ; ANIM_OBJ_8D
+	battleanimobj $21, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, $02, $1f ; ANIM_OBJ_8E
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_15, BATTLEANIMFUNC_08, $02, $0a ; ANIM_OBJ_8F
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_02, $04, $03 ; ANIM_OBJ_90
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_42, $02, $08 ; ANIM_OBJ_91
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_9A, BATTLEANIMFUNC_00, $02, $1b ; ANIM_OBJ_92
+	battleanimobj $21, $a0, BATTLEANIMFRAMESET_9B, BATTLEANIMFUNC_35, $04, $23 ; ANIM_OBJ_93
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_23, $02, $25 ; ANIM_OBJ_94
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_9D, BATTLEANIMFUNC_25, $02, $25 ; ANIM_OBJ_95
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_00, $02, $25 ; ANIM_OBJ_96
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_9E, BATTLEANIMFUNC_00, $06, $25 ; ANIM_OBJ_97
+	battleanimobj $61, $80, BATTLEANIMFRAMESET_9F, BATTLEANIMFUNC_3A, $05, $23 ; ANIM_OBJ_98
+	battleanimobj $21, $80, BATTLEANIMFRAMESET_A0, BATTLEANIMFUNC_16, $02, $23 ; ANIM_OBJ_99
+	battleanimobj $21, $70, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_43, $03, $23 ; ANIM_OBJ_9A
+	battleanimobj $21, $c0, BATTLEANIMFRAMESET_A2, BATTLEANIMFUNC_01, $02, $25 ; ANIM_OBJ_9B
+	battleanimobj $21, $40, BATTLEANIMFRAMESET_A3, BATTLEANIMFUNC_44, $03, $24 ; ANIM_OBJ_9C
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_A4, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_9D
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_A5, BATTLEANIMFUNC_00, $03, $24 ; ANIM_OBJ_9E
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_45, $04, $12 ; ANIM_OBJ_9F
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_A6, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A0
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_A7, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A1
+	battleanimobj $21, $00, BATTLEANIMFRAMESET_B4, BATTLEANIMFUNC_4A, $07, $0f ; ANIM_OBJ_A2
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_A8, BATTLEANIMFUNC_02, $03, $05 ; ANIM_OBJ_A3
+	battleanimobj $21, $40, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_11, $02, $25 ; ANIM_OBJ_A4
+	battleanimobj $61, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, $02, $23 ; ANIM_OBJ_A5
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, $02, $0e ; ANIM_OBJ_A6
+	battleanimobj $01, $80, BATTLEANIMFRAMESET_AA, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_A7
+	battleanimobj $21, $b8, BATTLEANIMFRAMESET_AB, BATTLEANIMFUNC_48, $02, $13 ; ANIM_OBJ_A8
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_AC, BATTLEANIMFUNC_44, $02, $13 ; ANIM_OBJ_A9
+	battleanimobj $01, $a8, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_AA
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_43, $02, $0e ; ANIM_OBJ_AB
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_AD, BATTLEANIMFUNC_00, $06, $17 ; ANIM_OBJ_AC
+	battleanimobj $01, $a8, BATTLEANIMFRAMESET_AE, BATTLEANIMFUNC_49, $02, $01 ; ANIM_OBJ_AD
+	battleanimobj $21, $90, BATTLEANIMFRAMESET_AF, BATTLEANIMFUNC_01, $03, $11 ; ANIM_OBJ_AE
+	battleanimobj $21, $00, BATTLEANIMFRAMESET_B0, BATTLEANIMFUNC_4A, $02, $04 ; ANIM_OBJ_AF
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_4B, $04, $1c ; ANIM_OBJ_B0
+	battleanimobj $01, $88, BATTLEANIMFRAMESET_B1, BATTLEANIMFUNC_4C, $02, $19 ; ANIM_OBJ_B1
+	battleanimobj $01, $b8, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4D, $07, $09 ; ANIM_OBJ_B2
+	battleanimobj $61, $98, BATTLEANIMFRAMESET_B3, BATTLEANIMFUNC_00, $03, $27 ; ANIM_OBJ_B3
+	battleanimobj $61, $98, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_04, $06, $15 ; ANIM_OBJ_B4
+	battleanimobj $21, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4E, $07, $09 ; ANIM_OBJ_B5
+	battleanimobj $01, $90, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_08, $04, $1e ; ANIM_OBJ_FLOWER
+	battleanimobj $01, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, $04, $1f ; ANIM_OBJ_COTTON
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_B8
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_B9
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_BA
+	battleanimobj $00, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_BB
 ; ccfbe
 
 INCLUDE "battle/objects/functions.asm"
--- a/battle/anims.asm
+++ b/battle/anims.asm
@@ -510,10 +510,10 @@
 BattleAnim_Slp: ; c94a3
 	anim_1gfx ANIM_GFX_STATUS
 	anim_sound 0, 0, SFX_TAIL_WHIP
-BattleAnim_Slp_branch_c94a8: ; c94a8
+.loop
 	anim_obj ANIM_OBJ_54,   8, 0,  10, 0, $0
 	anim_wait 40
-	anim_loop 3, BattleAnim_Slp_branch_c94a8
+	anim_loop 3, .loop
 	anim_wait 32
 	anim_ret
 ; c94b4
@@ -520,11 +520,11 @@
 
 BattleAnim_Brn: ; c94b4
 	anim_1gfx ANIM_GFX_FIRE
-BattleAnim_Brn_branch_c94b6: ; c94b6
+.loop
 	anim_sound 0, 0, SFX_BURN
 	anim_obj ANIM_OBJ_BURNED,   7, 0,  11, 0, $10
 	anim_wait 4
-	anim_loop 3, BattleAnim_Brn_branch_c94b6
+	anim_loop 3, .loop
 	anim_wait 6
 	anim_ret
 ; c94c5
@@ -592,10 +592,10 @@
 	anim_obj ANIM_OBJ_A2,   9, 0,   0, 0, $1
 	anim_wait 8
 	anim_obj ANIM_OBJ_A2,   7, 0,   0, 0, $2
-BattleAnim_InSandstorm_branch_c9546: ; c9546
+.loop
 	anim_sound 0, 1, SFX_MENU
 	anim_wait 8
-	anim_loop 6, BattleAnim_InSandstorm_branch_c9546
+	anim_loop 6, .loop
 	anim_wait 8
 	anim_ret
 ; c9550
@@ -612,10 +612,10 @@
 	anim_1gfx ANIM_GFX_WIND
 	anim_bgeffect ANIM_BG_WHIRLPOOL, $0, $0, $0
 	anim_sound 0, 1, SFX_SURF
-BattleAnim_InWhirlpool_branch_c9566: ; c9566
+.loop
 	anim_obj ANIM_OBJ_GUST, -16, 4,   9, 0, $0
 	anim_wait 6
-	anim_loop 6, BattleAnim_InWhirlpool_branch_c9566
+	anim_loop 6, .loop
 	anim_incbgeffect ANIM_BG_WHIRLPOOL
 	anim_wait 1
 	anim_ret
@@ -634,12 +634,12 @@
 ; c9581
 
 BattleAnim_EnemyDamage: ; c9581
-BattleAnim_EnemyDamage_branch_c9581: ; c9581
+.loop
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0
 	anim_wait 5
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $0, $0
 	anim_wait 5
-	anim_loop 3, BattleAnim_EnemyDamage_branch_c9581
+	anim_loop 3, .loop
 	anim_ret
 ; c9592
 
@@ -755,8 +755,7 @@
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $3
-BattleAnim_Bide_branch_c965e: ; c965e
-BattleAnim_MegaPunch_branch_c965e: ; c965e
+.loop
 	anim_sound 0, 1, SFX_MEGA_PUNCH
 	anim_obj ANIM_OBJ_06, -15, 0,   7, 0, $0
 	anim_obj ANIM_OBJ_00, -15, 0,   7, 0, $0
@@ -763,7 +762,7 @@
 	anim_wait 6
 	anim_obj ANIM_OBJ_06, -15, 0,   7, 0, $0
 	anim_wait 6
-	anim_loop 3, BattleAnim_Bide_branch_c965e
+	anim_loop 3, .loop
 	anim_ret
 ; c9677
 
@@ -869,7 +868,7 @@
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 67
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $3
-BattleAnim_MegaKick_branch_c974b: ; c974b
+.loop
 	anim_sound 0, 1, SFX_MEGA_KICK
 	anim_obj ANIM_OBJ_07, -15, 0,   7, 0, $0
 	anim_obj ANIM_OBJ_00, -15, 0,   7, 0, $0
@@ -876,7 +875,7 @@
 	anim_wait 6
 	anim_obj ANIM_OBJ_07, -15, 0,   7, 0, $0
 	anim_wait 6
-	anim_loop 3, BattleAnim_MegaKick_branch_c974b
+	anim_loop 3, .loop
 	anim_ret
 ; c9764
 
@@ -896,7 +895,7 @@
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $3
-BattleAnim_SuperFang_branch_c9788: ; c9788
+.loop
 	anim_sound 0, 1, SFX_BITE
 	anim_obj ANIM_OBJ_09, -15, 0,   7, 0, $0
 	anim_obj ANIM_OBJ_00, -15, 0,   7, 0, $0
@@ -903,7 +902,7 @@
 	anim_wait 6
 	anim_obj ANIM_OBJ_09, -15, 0,   7, 0, $0
 	anim_wait 6
-	anim_loop 3, BattleAnim_SuperFang_branch_c9788
+	anim_loop 3, .loop
 	anim_ret
 ; c97a1
 
@@ -939,7 +938,7 @@
 
 BattleAnim_FireSpin: ; c97e5
 	anim_1gfx ANIM_GFX_FIRE
-BattleAnim_FireSpin_branch_c97e7: ; c97e7
+.loop
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_0E,   8, 0,  11, 0, $4
 	anim_wait 2
@@ -952,7 +951,7 @@
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_0E,   8, 0,  12, 0, $4
 	anim_wait 2
-	anim_loop 2, BattleAnim_FireSpin_branch_c97e7
+	anim_loop 2, .loop
 	anim_wait 96
 	anim_ret
 ; c9811
@@ -959,11 +958,11 @@
 
 BattleAnim_DragonRage: ; c9811
 	anim_1gfx ANIM_GFX_FIRE
-BattleAnim_DragonRage_branch_c9813: ; c9813
+.loop
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_0C,   8, 0,  11, 4, $0
 	anim_wait 3
-	anim_loop 16, BattleAnim_DragonRage_branch_c9813
+	anim_loop 16, .loop
 	anim_wait 64
 	anim_ret
 ; c9822
@@ -987,10 +986,10 @@
 	anim_wait 2
 	anim_obj ANIM_OBJ_0D, -15, 0,   7, 0, $8
 	anim_wait 16
-BattleAnim_Flamethrower_branch_c9857: ; c9857
+.loop
 	anim_sound 0, 1, SFX_EMBER
 	anim_wait 16
-	anim_loop 6, BattleAnim_Flamethrower_branch_c9857
+	anim_loop 6, .loop
 	anim_wait 16
 	anim_ret
 ; c9861
@@ -997,15 +996,15 @@
 
 BattleAnim_FireBlast: ; c9861
 	anim_1gfx ANIM_GFX_FIRE
-BattleAnim_FireBlast_branch_c9863: ; c9863
+.loop1
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_0F,   8, 0,  11, 4, $7
 	anim_wait 6
-	anim_loop 10, BattleAnim_FireBlast_branch_c9863
-BattleAnim_FireBlast_branch_c9870: ; c9870
+	anim_loop 10, .loop1
+.loop2
 	anim_sound 0, 1, SFX_EMBER
 	anim_wait 8
-	anim_loop 10, BattleAnim_FireBlast_branch_c9870
+	anim_loop 10, .loop2
 	anim_incobj  1
 	anim_incobj  2
 	anim_incobj  3
@@ -1017,7 +1016,7 @@
 	anim_incobj  9
 	anim_incobj 10
 	anim_wait 2
-BattleAnim_FireBlast_branch_c988d: ; c988d
+.loop3
 	anim_sound 0, 1, SFX_EMBER
 	anim_obj ANIM_OBJ_0F, -15, 0,   7, 0, $1
 	anim_obj ANIM_OBJ_0F, -15, 0,   7, 0, $2
@@ -1025,7 +1024,7 @@
 	anim_obj ANIM_OBJ_0F, -15, 0,   7, 0, $4
 	anim_obj ANIM_OBJ_0F, -15, 0,   7, 0, $5
 	anim_wait 16
-	anim_loop 2, BattleAnim_FireBlast_branch_c988d
+	anim_loop 2, .loop3
 	anim_wait 32
 	anim_ret
 ; c98b0
@@ -1040,17 +1039,17 @@
 
 BattleAnim_IceBeam: ; c98bd
 	anim_1gfx ANIM_GFX_ICE
-BattleAnim_IceBeam_branch_c98bf: ; c98bf
+.loop
 	anim_sound 6, 2, SFX_SHINE
 	anim_obj ANIM_OBJ_13,   8, 0,  11, 4, $4
 	anim_wait 4
-	anim_loop 5, BattleAnim_IceBeam_branch_c98bf
+	anim_loop 5, .loop
 	anim_obj ANIM_OBJ_29, -15, 0,   9, 2, $10
-BattleAnim_IceBeam_branch_c98d1: ; c98d1
+.loop2
 	anim_sound 6, 2, SFX_SHINE
 	anim_obj ANIM_OBJ_13,   8, 0,  11, 4, $4
 	anim_wait 4
-	anim_loop 15, BattleAnim_IceBeam_branch_c98d1
+	anim_loop 15, .loop2
 	anim_wait 48
 	anim_sound 0, 1, SFX_SHINE
 	anim_wait 8
@@ -1061,7 +1060,7 @@
 
 BattleAnim_Blizzard: ; c98e8
 	anim_1gfx ANIM_GFX_ICE
-BattleAnim_Blizzard_branch_c98ea: ; c98ea
+.loop
 	anim_sound 6, 2, SFX_SHINE
 	anim_obj ANIM_OBJ_11,   8, 0,  11, 0, $63
 	anim_wait 2
@@ -1071,7 +1070,7 @@
 	anim_sound 6, 2, SFX_SHINE
 	anim_obj ANIM_OBJ_11,   8, 0,  12, 0, $63
 	anim_wait 2
-	anim_loop 3, BattleAnim_Blizzard_branch_c98ea
+	anim_loop 3, .loop
 	anim_bgeffect ANIM_BG_WHITE_HUES, $0, $8, $0
 	anim_wait 32
 	anim_obj ANIM_OBJ_29, -15, 0,   9, 2, $10
@@ -1100,7 +1099,7 @@
 
 BattleAnim_Bubblebeam: ; c993d
 	anim_1gfx ANIM_GFX_BUBBLE
-BattleAnim_Bubblebeam_branch_c993f: ; c993f
+.loop
 	anim_sound 16, 2, SFX_BUBBLEBEAM
 	anim_obj ANIM_OBJ_21,   8, 0,  11, 4, $92
 	anim_wait 6
@@ -1110,7 +1109,7 @@
 	anim_sound 16, 2, SFX_BUBBLEBEAM
 	anim_obj ANIM_OBJ_21,   8, 0,  11, 4, $f4
 	anim_wait 8
-	anim_loop 3, BattleAnim_Bubblebeam_branch_c993f
+	anim_loop 3, .loop
 	anim_wait 64
 	anim_clearobjs
 	anim_bgeffect ANIM_BG_30, $0, $0, $0
@@ -1189,10 +1188,10 @@
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_bgeffect ANIM_BG_SURF, $0, $0, $0
 	anim_obj ANIM_OBJ_22,  11, 0,  13, 0, $8
-BattleAnim_Surf_branch_c9a36: ; c9a36
+.loop
 	anim_sound 0, 1, SFX_SURF
 	anim_wait 32
-	anim_loop 4, BattleAnim_Surf_branch_c9a36
+	anim_loop 4, .loop
 	anim_incobj  1
 	anim_wait 56
 	anim_ret
@@ -2134,9 +2133,9 @@
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_VICEGRIP
 	anim_call BattleAnim_FollowPlayerHead_0
-	anim_bgeffect ANIM_BG_22, $0, $1, $0
+	anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0
 	anim_wait 96
-	anim_incbgeffect ANIM_BG_22
+	anim_incbgeffect ANIM_BG_BOUNCE_DOWN
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
 ; ca24b
@@ -2146,7 +2145,7 @@
 	anim_jumpif $0, .hit
 	anim_jumpif $2, .fail
 	anim_call BattleAnim_FollowPlayerHead_0
-	anim_bgeffect ANIM_BG_23, $0, $1, $1
+	anim_bgeffect ANIM_BG_DIG, $0, $1, $1
 	anim_obj ANIM_OBJ_57,   9, 0,  13, 0, $0
 .loop
 	anim_sound 0, 0, SFX_RAZOR_WIND
@@ -2156,7 +2155,7 @@
 	anim_wait 32
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
 	anim_wait 8
-	anim_incbgeffect ANIM_BG_23
+	anim_incbgeffect ANIM_BG_DIG
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
 
@@ -2229,9 +2228,9 @@
 BattleAnim_BodySlam: ; ca307
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
-	anim_bgeffect ANIM_BG_22, $0, $1, $0
+	anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0
 	anim_wait 32
-	anim_incbgeffect ANIM_BG_22
+	anim_incbgeffect ANIM_BG_BOUNCE_DOWN
 	anim_wait 4
 	anim_bgeffect ANIM_BG_25, $0, $1, $0
 	anim_wait 3
@@ -4202,10 +4201,10 @@
 BattleAnim_Return: ; cb464
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
-	anim_bgeffect ANIM_BG_22, $0, $1, $0
+	anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0
 	anim_sound 0, 0, SFX_RETURN
 	anim_wait 64
-	anim_incbgeffect ANIM_BG_22
+	anim_incbgeffect ANIM_BG_BOUNCE_DOWN
 	anim_wait 32
 	anim_bgeffect ANIM_BG_25, $0, $1, $0
 	anim_wait 4
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -1,3 +1,11 @@
+	const_def
+	const BGSQUARE_SIX
+	const BGSQUARE_FOUR
+	const BGSQUARE_TWO
+	const BGSQUARE_SEVEN
+	const BGSQUARE_FIVE
+	const BGSQUARE_THREE
+
 ; BG effects for use in battle animations.
 
 ExecuteBGEffects: ; c8000 (32:4000)
@@ -105,8 +113,8 @@
 	dw BattleBGEffect_1f
 	dw BattleBGEffect_20
 	dw BattleBGEffect_21
-	dw BattleBGEffect_22
-	dw BattleBGEffect_23
+	dw BattleBGEffect_BounceDown
+	dw BattleBGEffect_Dig
 	dw BattleBGEffect_Tackle
 	dw BattleBGEffect_25
 	dw BattleBGEffect_26
@@ -197,7 +205,7 @@
 	ret
 
 .init
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
@@ -289,11 +297,11 @@
 
 ; c8185 (32:4185)
 
-.PalsCGB:
+.PalsCGB
 	db $e4, $90, $fe
 ; c8188
 
-.PalsSGB:
+.PalsSGB
 	db $f0, $c0, $fe
 ; c818b
 
@@ -312,11 +320,11 @@
 
 ; c819f (32:419f)
 
-.PalsCGB:
+.PalsCGB
 	db $e4, $d8, $fe
 ; c81a2
 
-.PalsSGB:
+.PalsSGB
 	db $f0, $cc, $fe
 ; c81a5
 
@@ -328,7 +336,7 @@
 
 ; c81af (32:41af)
 
-.Pals:
+.Pals
 	db $1b, $63, $87, $fe
 ; c81b3
 
@@ -335,26 +343,26 @@
 BattleBGEffect_HideMon: ; c81b3 (32:41b3)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc81c0
+	dw .zero
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
-	dw Functionc81e3
+	dw .four
 
 
-Functionc81c0: ; c81c0 (32:41c0)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	push bc
-	call Functionc9038
-	jr nz, .six_by_six
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_side
 	hlcoord 12, 0
 	lb bc, 7, 7
-	jr .got_dims
+	jr .got_pointer
 
-.six_by_six
+.player_side
 	hlcoord 2, 6
 	lb bc, 6, 6
-.got_dims
+.got_pointer
 	call ClearBox
 	pop bc
 	xor a
@@ -363,7 +371,7 @@
 	ld [hBGMapMode], a
 	ret
 
-Functionc81e3: ; c81e3 (32:41e3)
+.four
 	xor a
 	ld [hBGMapMode], a
 	call EndBattleBGEffect
@@ -370,75 +378,75 @@
 	ret
 
 BattleBGEffect_ShowMon: ; c81ea (32:41ea)
-	call Functionc9042
-	jr z, .asm_c81f3
+	call BGEffect_CheckFlyDigStatus
+	jr z, .not_flying
 	call EndBattleBGEffect
 	ret
 
-.asm_c81f3
-	call Functionc9038
-	jr nz, .six_by_six
-	ld de, Unknown_c8210
-	jr .got_dims
+.not_flying
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_side
+	ld de, .EnemyData
+	jr .got_pointer
 
-.six_by_six
-	ld de, Unknown_c820c
-.got_dims
+.player_side
+	ld de, .PlayerData
+.got_pointer
 	ld a, e
 	ld [wBattleAnimTemp1], a
 	ld a, d
 	ld [wBattleAnimTemp2], a
-	call Functionc83ed
+	call BattleBGEffect_RunPicResizeScript
 	ret
 
 ; c820c (32:420c)
 
-Unknown_c820c:
-	db $00, $31, $00
-	db $ff
+.PlayerData
+	db  0, $31, 0
+	db -1
 ; c8210
 
-Unknown_c8210:
-	db $03, $00, $03
-	db $ff
+.EnemyData
+	db  3, $00, 3
+	db -1
 ; c8214
 
 BattleBGEffect_FeetFollow: ; c8214 (32:4214)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8223
-	dw Functionc825a
+	dw .zero
+	dw .one
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
-	dw Functionc827a
+	dw .five
 
 
-Functionc8223: ; c8223 (32:4223)
-	call Functionc9042
-	jr z, .asm_c8230
+.zero
+	call BGEffect_CheckFlyDigStatus
+	jr z, .not_flying_digging
 	ld hl, wNumActiveBattleAnims
 	inc [hl]
 	call EndBattleBGEffect
 	ret
 
-.asm_c8230
+.not_flying_digging
 	call BattleBGEffects_IncrementJumptable
 	push bc
-	call Functionc9038
-	jr nz, .asm_c8242
-	ld a, $b8
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn
+	ld a, ANIM_OBJ_B8
 	ld [wBattleAnimTemp0], a
-	ld a, $84
-	jr .asm_c8249
+	ld a, 16 * 8 + 4
+	jr .okay
 
-.asm_c8242
-	ld a, $b9
+.player_turn
+	ld a, ANIM_OBJ_B9
 	ld [wBattleAnimTemp0], a
-	ld a, $30
-.asm_c8249
+	ld a, 6 * 8
+.okay
 	ld [wBattleAnimTemp1], a
-	ld a, $40
+	ld a, 8 * 8
 	ld [wBattleAnimTemp2], a
 	xor a
 	ld [wBattleAnimTemp3], a
@@ -446,19 +454,19 @@
 	pop bc
 	ret
 
-Functionc825a: ; c825a (32:425a)
+.one
 	call BattleBGEffects_IncrementJumptable
 	push bc
-	call Functionc9038
-	jr nz, .asm_c826b
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn_2
 	hlcoord 12, 6
-	ld bc, $107
-	jr .asm_c8271
+	lb bc, 1, 7
+	jr .okay2
 
-.asm_c826b
+.player_turn_2
 	hlcoord 2, 6
 	lb bc, 1, 6
-.asm_c8271
+.okay2
 	call ClearBox
 	ld a, $1
 	ld [hBGMapMode], a
@@ -465,7 +473,7 @@
 	pop bc
 	ret
 
-Functionc827a: ; c827a (32:427a)
+.five
 	xor a
 	ld [hBGMapMode], a
 	call EndBattleBGEffect
@@ -474,39 +482,39 @@
 BattleBGEffect_HeadFollow: ; c8281 (32:4281)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8290
-	dw Functionc82c7
+	dw .zero
+	dw .one
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
-	dw Functionc82e7
+	dw .five
 
 
-Functionc8290: ; c8290 (32:4290)
-	call Functionc9042
-	jr z, .asm_c829d
+.zero
+	call BGEffect_CheckFlyDigStatus
+	jr z, .not_flying_digging
 	ld hl, wNumActiveBattleAnims
 	inc [hl]
 	call EndBattleBGEffect
 	ret
 
-.asm_c829d
+.not_flying_digging
 	call BattleBGEffects_IncrementJumptable
 	push bc
-	call Functionc9038
-	jr nz, .asm_c82af
-	ld a, $ba
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn
+	ld a, ANIM_OBJ_BA
 	ld [wBattleAnimTemp0], a
-	ld a, $84
-	jr .asm_c82b6
+	ld a, 16 * 8 + 4
+	jr .okay
 
-.asm_c82af
-	ld a, $bb
+.player_turn
+	ld a, ANIM_OBJ_BB
 	ld [wBattleAnimTemp0], a
-	ld a, $30
-.asm_c82b6
+	ld a, 6 * 8
+.okay
 	ld [wBattleAnimTemp1], a
-	ld a, $40
+	ld a, 8 * 8
 	ld [wBattleAnimTemp2], a
 	xor a
 	ld [wBattleAnimTemp3], a
@@ -514,19 +522,19 @@
 	pop bc
 	ret
 
-Functionc82c7: ; c82c7 (32:42c7)
+.one
 	call BattleBGEffects_IncrementJumptable
 	push bc
-	call Functionc9038
-	jr nz, .asm_c82d8
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn_2
 	hlcoord 12, 5
-	ld bc, $207
-	jr .asm_c82de
+	lb bc, 2, 7
+	jr .okay2
 
-.asm_c82d8
+.player_turn_2
 	hlcoord 2, 6
 	lb bc, 2, 6
-.asm_c82de
+.okay2
 	call ClearBox
 	ld a, $1
 	ld [hBGMapMode], a
@@ -533,7 +541,7 @@
 	pop bc
 	ret
 
-Functionc82e7: ; c82e7 (32:42e7)
+.five
 	xor a
 	ld [hBGMapMode], a
 	call EndBattleBGEffect
@@ -546,77 +554,77 @@
 BattleBGEffect_27: ; c82f5 (32:42f5)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8302
-	dw Functionc831d
+	dw .zero
+	dw .one
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
-	dw Functionc8365
+	dw .four
 
 
-Functionc8302: ; c8302 (32:4302)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	ld [hl], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_c8315
+	jr z, .user
 	ld a, $9
-	jr .asm_c8317
+	jr .okay
 
-.asm_c8315
+.user
 	ld a, $8
-.asm_c8317
+.okay
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], a
 	ret
 
-Functionc831d: ; c831d (32:431d)
-	ld hl, BG_EFFECT_STRUCT_02
+.one
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_c833e
+	jr z, .user_2
 	hlcoord 0, 6
-	ld de, $806
-.asm_c832b
+	lb de, 8, 6
+.row1
 	push de
 	push hl
-.asm_c832d
+.col1
 	inc hl
 	ld a, [hld]
 	ld [hli], a
 	dec d
-	jr nz, .asm_c832d
+	jr nz, .col1
 	pop hl
-	ld de, $14
+	ld de, SCREEN_WIDTH
 	add hl, de
 	pop de
 	dec e
-	jr nz, .asm_c832b
-	jr .asm_c8355
+	jr nz, .row1
+	jr .okay2
 
-.asm_c833e
+.user_2
 	hlcoord 19, 0
-	ld de, $807
-.asm_c8344
+	lb de, 8, 7
+.row2
 	push de
 	push hl
-.asm_c8346
+.col2
 	dec hl
 	ld a, [hli]
 	ld [hld], a
 	dec d
-	jr nz, .asm_c8346
+	jr nz, .col2
 	pop hl
-	ld de, $14
+	ld de, SCREEN_WIDTH
 	add hl, de
 	pop de
 	dec e
-	jr nz, .asm_c8344
-.asm_c8355
+	jr nz, .row2
+.okay2
 	xor a
 	ld [hBGMapThird], a
 	ld a, $1
@@ -627,7 +635,7 @@
 	dec [hl]
 	ret
 
-Functionc8365: ; c8365 (32:4365)
+.four
 	xor a
 	ld [hBGMapMode], a
 	ld hl, BG_EFFECT_STRUCT_03
@@ -634,99 +642,99 @@
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_c8377
+	jr z, .done
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	ld [hl], $1
 	ret
 
-.asm_c8377
+.done
 	call EndBattleBGEffect
 	ret
 
 BattleBGEffect_EnterMon: ; c837b (32:437b)
-	call Functionc9038
-	jr nz, .asm_c8385
-	ld de, Unknown_c839e
-	jr .asm_c8388
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn
+	ld de, .EnemyData
+	jr .okay
 
-.asm_c8385
-	ld de, Unknown_c8394
-.asm_c8388
+.player_turn
+	ld de, .PlayerData
+.okay
 	ld a, e
 	ld [wBattleAnimTemp1], a
 	ld a, d
 	ld [wBattleAnimTemp2], a
-	call Functionc83ed
+	call BattleBGEffect_RunPicResizeScript
 	ret
 
 ; c8394 (32:4394)
 
-Unknown_c8394:
-	db $02, $31, $02
-	db $01, $31, $01
-	db $00, $31, $00
-	db $ff
+.PlayerData
+	db  2, $31, 2
+	db  1, $31, 1
+	db  0, $31, 0
+	db -1
 ; c839e
 
-Unknown_c839e:
-	db $05, $00, $05
-	db $04, $00, $04
-	db $03, $00, $03
-	db $ff
+.EnemyData
+	db  5, $00, 5
+	db  4, $00, 4
+	db  3, $00, 3
+	db -1
 ; c83a8
 
 BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
-	call Functionc9038
-	jr nz, .asm_c83b2
-	ld de, Unknown_c83d7
-	jr .asm_c83b5
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn
+	ld de, .EnemyData
+	jr .okay
 
-.asm_c83b2
-	ld de, Unknown_c83c1
-.asm_c83b5
+.player_turn
+	ld de, .PlayerData
+.okay
 	ld a, e
 	ld [wBattleAnimTemp1], a
 	ld a, d
 	ld [wBattleAnimTemp2], a
-	call Functionc83ed
+	call BattleBGEffect_RunPicResizeScript
 	ret
 
 ; c83c1 (32:43c1)
 
-Unknown_c83c1:
-	db $00, $31, $00
-	db $fe, $66, $00
-	db $01, $31, $01
-	db $fe, $44, $01
-	db $02, $31, $02
-	db $fe, $22, $02
-	db $fd, $00, $00
-	db $ff
+.PlayerData
+	db  0, $31, 0
+	db -2, $66, 0
+	db  1, $31, 1
+	db -2, $44, 1
+	db  2, $31, 2
+	db -2, $22, 2
+	db -3, $00, 0
+	db -1
 ; c83d7
 
-Unknown_c83d7:
-	db $03, $00, $03
-	db $fe, $77, $03
-	db $04, $00, $04
-	db $fe, $55, $04
-	db $05, $00, $05
-	db $fe, $33, $05
-	db $fd, $00, $00
-	db $ff
+.EnemyData
+	db  3, $00, 3
+	db -2, $77, 3
+	db  4, $00, 4
+	db -2, $55, 4
+	db  5, $00, 5
+	db -2, $33, 5
+	db -3, $00, 0
+	db -1
 ; c83ed
 
-Functionc83ed: ; c83ed (32:43ed)
+BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc83fa
+	dw .zero
 	dw BattleBGEffects_IncrementJumptable
 	dw BattleBGEffects_IncrementJumptable
-	dw Functionc842a
-	dw Functionc8434
+	dw .restart
+	dw .end
 
 
-Functionc83fa: ; c83fa (32:43fa)
+.zero
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld e, [hl]
@@ -740,24 +748,24 @@
 	add hl, de
 endr
 	ld a, [hl]
-	cp $ff
-	jr z, Functionc8434
-	cp $fe
-	jr z, .asm_c8425
-	cp $fd
-	jr z, .asm_c841d
-	call Functionc8458
-.asm_c841d
+	cp -1
+	jr z, .end
+	cp -2
+	jr z, .clear
+	cp -3
+	jr z, .skip
+	call .FillBox
+.skip
 	call BattleBGEffects_IncrementJumptable
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
 
-.asm_c8425
-	call Functionc843b
-	jr Functionc83fa
+.clear
+	call .ClearBox
+	jr .zero
 
-Functionc842a: ; c842a (32:442a)
+.restart
 	xor a
 	ld [hBGMapMode], a
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
@@ -765,13 +773,14 @@
 	ld [hl], $0
 	ret
 
-Functionc8434: ; c8434 (32:4434)
+.end
 	xor a
 	ld [hBGMapMode], a
 	call EndBattleBGEffect
 	ret
 
-Functionc843b: ; c843b (32:443b)
+.ClearBox
+; get dims
 	push bc
 	inc hl
 	ld a, [hli]
@@ -782,9 +791,10 @@
 	swap a
 	and $f
 	ld b, a
+; get coords
 	ld e, [hl]
 	ld d, 0
-	ld hl, Unknown_c849c
+	ld hl, .Coords
 rept 2
 	add hl, de
 endr
@@ -795,12 +805,13 @@
 	pop bc
 	ret
 
-Functionc8458: ; c8458 (32:4458)
+.FillBox
+; get dims
 	push bc
 	push hl
 	ld e, [hl]
 	ld d, 0
-	ld hl, Unknown_c84a8
+	ld hl, .BGSquares
 rept 3
 	add hl, de
 endr
@@ -812,17 +823,20 @@
 	swap a
 	and $f
 	ld b, a
+; store pointer
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
+; get byte
 	pop hl
 	inc hl
 	ld a, [hli]
 	ld [wBattleAnimTemp0], a
+; get coord
 	push de
 	ld e, [hl]
 	ld d, 0
-	ld hl, Unknown_c849c
+	ld hl, .Coords
 rept 2
 	add hl, de
 endr
@@ -830,30 +844,29 @@
 	ld h, [hl]
 	ld l, a
 	pop de
-.asm_c8484
+; fill box
+.row
 	push bc
 	push hl
 	ld a, [wBattleAnimTemp0]
 	ld b, a
-.asm_c848a
+.col
 	ld a, [de]
 	add b
 	ld [hli], a
 	inc de
 	dec c
-	jr nz, .asm_c848a
+	jr nz, .col
 	pop hl
-	ld bc, $14
+	ld bc, SCREEN_WIDTH
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .asm_c8484
+	jr nz, .row
 	pop bc
 	ret
 
-; c849c (32:449c)
-
-Unknown_c849c: ; c849c
+.Coords
 	dwcoord  2,  6
 	dwcoord  3,  8
 	dwcoord  4, 10
@@ -860,18 +873,21 @@
 	dwcoord 12,  0
 	dwcoord 13,  2
 	dwcoord 14,  4
-; c84a8
 
-Unknown_c84a8: ; c84a8
-	dbw $66, Unknown_c84ba
-	dbw $44, Unknown_c84de
-	dbw $22, Unknown_c84ee
-	dbw $77, Unknown_c84f2
-	dbw $55, Unknown_c8523
-	dbw $33, Unknown_c853c
-; c84ba
+.BGSquares
+bgsquare: MACRO
+	dn \1,\2
+	dw \3
+endm
 
-Unknown_c84ba: ; c84ba
+	bgsquare 6, 6, .SixBySix
+	bgsquare 4, 4, .FourByFour
+	bgsquare 2, 2, .TwoByTwo
+	bgsquare 7, 7, .SevenBySeven
+	bgsquare 5, 5, .FiveByFive
+	bgsquare 3, 3, .ThreeByThree
+
+.SixBySix
 	db $00, $06, $0c, $12, $18, $1e
 	db $01, $07, $0d, $13, $19, $1f
 	db $02, $08, $0e, $14, $1a, $20
@@ -878,21 +894,18 @@
 	db $03, $09, $0f, $15, $1b, $21
 	db $04, $0a, $10, $16, $1c, $22
 	db $05, $0b, $11, $17, $1d, $23
-; c84de
 
-Unknown_c84de: ; c84de
+.FourByFour
 	db $00, $0c, $12, $1e
 	db $02, $0e, $14, $20
 	db $03, $0f, $15, $21
 	db $05, $11, $17, $23
-; c84ee
 
-Unknown_c84ee: ; c84ee
+.TwoByTwo
 	db $00, $1e
 	db $05, $23
-; c84f2
 
-Unknown_c84f2: ; c84f2
+.SevenBySeven
 	db $00, $07, $0e, $15, $1c, $23, $2a
 	db $01, $08, $0f, $16, $1d, $24, $2b
 	db $02, $09, $10, $17, $1e, $25, $2c
@@ -900,17 +913,15 @@
 	db $04, $0b, $12, $19, $20, $27, $2e
 	db $05, $0c, $13, $1a, $21, $28, $2f
 	db $06, $0d, $14, $1b, $22, $29, $30
-; c8523
 
-Unknown_c8523: ; c8523
+.FiveByFive
 	db $00, $07, $15, $23, $2a
 	db $01, $08, $16, $24, $2b
 	db $03, $0a, $18, $26, $2d
 	db $05, $0c, $1a, $28, $2f
 	db $06, $0d, $1b, $29, $30
-; c853c
 
-Unknown_c853c: ; c853c
+.ThreeByThree
 	db $00, $15, $2a
 	db $03, $18, $2d
 	db $06, $1b, $30
@@ -924,12 +935,12 @@
 	dw .two
 
 
-.zero: ; c854e (32:454e)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	lb de, 2, 2
 	call InitSurfWaves
 
-.one: ; c8557 (32:4557)
+.one
 	ld a, [hLCDStatCustom]
 	and a
 	ret z
@@ -938,11 +949,11 @@
 	pop bc
 	ret
 
-.two: ; c8561 (32:4561)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-.RotatewSurfWaveBGEffect: ; c8565 (32:4565)
+.RotatewSurfWaveBGEffect
 	ld hl, wSurfWaveBGEffect
 	ld de, wSurfWaveBGEffect + 1
 	ld c, wSurfWaveBGEffectEnd - wSurfWaveBGEffect - 1
@@ -986,14 +997,14 @@
 BattleBGEffect_Whirlpool: ; c8599 (32:4599)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc85a2
-	dw Functionc85ba
-	dw Functionc85be
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc85a2: ; c85a2 (32:45a2)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	ld [hLCDStatCustom], a
 	xor a
@@ -1000,20 +1011,20 @@
 	ld [hLCDStatCustom + 1], a
 	ld a, $5e
 	ld [hLCDStatCustom + 2], a
-	ld de, $202
+	lb de, 2, 2
 	call Functionc8f2e
 	ret
 
-Functionc85ba: ; c85ba (32:45ba)
-	call Functionc8fef
+.one
+	call BattleBGEffect_WavyScreenFX
 	ret
 
-Functionc85be: ; c85be (32:45be)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
 BattleBGEffect_30: ; c85c2 (32:45c2)
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ede
 	call EndBattleBGEffect
@@ -1026,7 +1037,7 @@
 	ld e, a
 	add $4
 	ld [hl], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and $f0
@@ -1038,11 +1049,11 @@
 	add hl, bc
 	ld a, [hl]
 	ld [wBattleAnimTemp0], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	cp $20
-	jr nc, .asm_c85fc
+	jr nc, .done
 rept 2
 	inc [hl]
 endr
@@ -1049,8 +1060,8 @@
 	call Functionc8f9a
 	ret
 
-.asm_c85fc
-	call Functionc8eca
+.done
+	call BattleBGEffects_ClearLYOverrides
 	call EndBattleBGEffect
 	ret
 
@@ -1061,14 +1072,14 @@
 BattleBGEffect_Psychic: ; c8607 (32:4607)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8610
-	dw Functionc862e
-	dw Functionc863b
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc8610: ; c8610 (32:4610)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	ld [hLCDStatCustom], a
 	xor a
@@ -1075,7 +1086,7 @@
 	ld [hLCDStatCustom + 1], a
 	ld a, $5f
 	ld [hLCDStatCustom + 2], a
-	ld de, $605
+	lb de, 6, 5
 	call Functionc8f2e
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
@@ -1082,7 +1093,7 @@
 	ld [hl], $0
 	ret
 
-Functionc862e: ; c862e (32:462e)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -1089,10 +1100,10 @@
 	inc [hl]
 	and $3
 	ret nz
-	call Functionc8fef
+	call BattleBGEffect_WavyScreenFX
 	ret
 
-Functionc863b: ; c863b (32:463b)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1099,25 +1110,25 @@
 BattleBGEffect_Teleport: ; c863f (32:463f)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8648
-	dw Functionc865a
-	dw Functionc865e
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc8648: ; c8648 (32:4648)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
-	ld de, $605
+	lb de, 6, 5
 	call Functionc8f2e
 	ret
 
-Functionc865a: ; c865a (32:465a)
-	call Functionc8fef
+.one
+	call BattleBGEffect_WavyScreenFX
 	ret
 
-Functionc865e: ; c865e (32:465e)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1124,28 +1135,28 @@
 BattleBGEffect_NightShade: ; c8662 (32:4662)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc866b
-	dw Functionc8681
-	dw Functionc8685
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc866b: ; c866b (32:466b)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ede
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld e, [hl]
-	ld d, $2
+	ld d, 2
 	call Functionc8f2e
 	ret
 
-Functionc8681: ; c8681 (32:4681)
-	call Functionc8fef
+.one
+	call BattleBGEffect_WavyScreenFX
 	ret
 
-Functionc8685: ; c8685 (32:4685)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1152,53 +1163,53 @@
 BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8698
-	dw Functionc86af
-	dw Functionc86cf
-	dw Functionc86bd
-	dw Functionc86e9
-	dw Functionc8705
+	dw .zero
+	dw .one
+	dw .two
+	dw .three
+	dw .four
+	dw .five
 
 
-Functionc8698: ; c8698 (32:4698)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
 	inc a
 	ld [hLCDStatCustom + 2], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $0
 	ret
 
-Functionc86af: ; c86af (32:46af)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
 	cp $10
-	jr nc, asm_c86cb
+	jr nc, .next
 	inc [hl]
-	call Functionc86ea
+	call .UpdateLYOverrides
 	ret
 
-Functionc86bd: ; c86bd (32:46bd)
+.three
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
 	cp $ff
-	jr z, asm_c86cb
+	jr z, .next
 	dec [hl]
-	call Functionc86ea
+	call .UpdateLYOverrides
 	ret
 
-asm_c86cb: ; c86cb (32:46cb)
+.next
 	call BattleBGEffects_IncrementJumptable
 	ret
 
-Functionc86cf: ; c86cf (32:46cf)
-	ld hl, BG_EFFECT_STRUCT_02
+.two
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	ld d, $2
@@ -1206,22 +1217,22 @@
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	add [hl]
-	call Functionc86ea
-	ld hl, BG_EFFECT_STRUCT_02
+	call .UpdateLYOverrides
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	add $4
 	ld [hl], a
 
-Functionc86e9: ; c86e9 (32:46e9)
+.four
 	ret
 
-Functionc86ea: ; c86ea (32:46ea)
+.UpdateLYOverrides
 	ld e, a
 	xor $ff
 	inc a
 	ld d, a
-	ld h, $d2
+	ld h, LYOverridesBackup / $100
 	ld a, [hLCDStatCustom + 1]
 	ld l, a
 	ld a, [hLCDStatCustom + 2]
@@ -1228,19 +1239,19 @@
 	sub l
 	srl a
 	push af
-.asm_c86fa
+.loop
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	inc hl
 	dec a
-	jr nz, .asm_c86fa
+	jr nz, .loop
 	pop af
 	ret nc
 	ld [hl], e
 	ret
 
-Functionc8705: ; c8705 (32:4705)
+.five
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1247,20 +1258,20 @@
 BattleBGEffect_AcidArmor: ; c8709 (32:4709)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8712
-	dw Functionc8732
-	dw Functionc875d
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc8712: ; c8712 (32:4712)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ede
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld e, [hl]
-	ld d, $2
+	ld d, 2
 	call Functionc8f2e
 	ld h, $d2
 	ld a, [hLCDStatCustom + 2]
@@ -1270,7 +1281,7 @@
 	ld [hl], $0
 	ret
 
-Functionc8732: ; c8732 (32:4732)
+.one
 	ld a, [hLCDStatCustom + 2]
 	ld l, a
 	ld h, $d2
@@ -1277,23 +1288,23 @@
 	ld e, l
 	ld d, h
 	dec de
-.asm_c873a
+.loop
 	ld a, [de]
 	dec de
 	ld [hld], a
 	ld a, [hLCDStatCustom + 1]
 	cp l
-	jr nz, .asm_c873a
+	jr nz, .loop
 	ld [hl], $90
 	ld a, [hLCDStatCustom + 2]
 	ld l, a
 	ld a, [hl]
 	cp $1
-	jr c, .asm_c8752
+	jr c, .okay
 	cp $90
-	jr z, .asm_c8752
+	jr z, .okay
 	ld [hl], $0
-.asm_c8752
+.okay
 	dec l
 	ld a, [hl]
 	cp $2
@@ -1303,7 +1314,7 @@
 	ld [hl], $0
 	ret
 
-Functionc875d: ; c875d (32:475d)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1310,31 +1321,31 @@
 BattleBGEffect_21: ; c8761 (32:4761)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc876a
-	dw Functionc8781
-	dw Functionc87a3
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc876a: ; c876a (32:476a)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
 	inc a
 	ld [hLCDStatCustom + 2], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $1
 	ret
 
-Functionc8781: ; c8781 (32:4781)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
 	and $3f
 	ld d, a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	cp d
@@ -1346,34 +1357,34 @@
 	rlca
 	rlca
 	and $3
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	add [hl]
 	ld [hl], a
 	ret
 
-Functionc87a3: ; c87a3 (32:47a3)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_23: ; c87a7 (32:47a7)
+BattleBGEffect_Dig: ; c87a7 (32:47a7)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc87b2
-	dw Functionc87cf
-	dw Functionc87de
-	dw Functionc8801
+	dw .zero
+	dw .one
+	dw .two
+	dw .three
 
 
-Functionc87b2: ; c87b2 (32:47b2)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
 	inc a
 	ld [hLCDStatCustom + 2], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $2
 	ld hl, BG_EFFECT_STRUCT_03
@@ -1381,26 +1392,25 @@
 	ld [hl], $0
 	ret
 
-Functionc87cf: ; c87cf (32:47cf)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_c87d9
+	jr z, .next
 	dec [hl]
 	ret
 
-.asm_c87d9
+.next
 	ld [hl], $10
 	call BattleBGEffects_IncrementJumptable
-
-Functionc87de: ; c87de (32:47de)
+.two
 	ld a, [hLCDStatCustom + 1]
 	ld l, a
 	ld a, [hLCDStatCustom + 2]
 	sub l
 	dec a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	cp [hl]
 	ret c
@@ -1407,14 +1417,14 @@
 	ld a, [hl]
 	push af
 	and $7
-	jr nz, .asm_c87f6
+	jr nz, .skip
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	dec [hl]
-.asm_c87f6
+.skip
 	pop af
 	call Functionc901b
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 rept 2
 	inc [hl]
@@ -1421,7 +1431,7 @@
 endr
 	ret
 
-Functionc8801: ; c8801 (32:4801)
+.three
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1428,15 +1438,15 @@
 BattleBGEffect_Tackle: ; c8805 (32:4805)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8810
-	dw Functionc8869
-	dw Functionc8888
-	dw Functionc8833
+	dw .zero
+	dw Tackle_BGEffect25_2d_one
+	dw Tackle_BGEffect25_2d_two
+	dw .three
 
 
-Functionc8810: ; c8810 (32:4810)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -1445,18 +1455,18 @@
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], $0
-	call Functionc9038
-	jr nz, .asm_c882f
-	ld a, $2
-	jr .asm_c8831
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_side
+	ld a, 2
+	jr .okay
 
-.asm_c882f
-	ld a, $fe
-.asm_c8831
+.player_side
+	ld a, -2
+.okay
 	ld [hl], a
 	ret
 
-Functionc8833: ; c8833 (32:4833)
+.three
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1463,15 +1473,15 @@
 BattleBGEffect_25: ; c8837 (32:4837)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8842
-	dw Functionc8869
-	dw Functionc8888
-	dw Functionc8865
+	dw .zero
+	dw Tackle_BGEffect25_2d_one
+	dw Tackle_BGEffect25_2d_two
+	dw .three
 
 
-Functionc8842: ; c8842 (32:4842)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ef4
 	ld a, [hLCDStatCustom + 2]
@@ -1480,34 +1490,34 @@
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], $0
-	call Functionc9038
-	jr nz, .asm_c8861
-	ld a, $2
-	jr .asm_c8863
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_side
+	ld a,  2
+	jr .okay
 
-.asm_c8861
-	ld a, $fe
-.asm_c8863
+.player_side
+	ld a, -2
+.okay
 	ld [hl], a
 	ret
 
-Functionc8865: ; c8865 (32:4865)
+.three
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-Functionc8869: ; c8869 (32:4869)
+Tackle_BGEffect25_2d_one:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
-	cp $f8
-	jr z, .asm_c8876
-	cp $8
-	jr nz, .asm_c8879
-.asm_c8876
+	cp -8
+	jr z, .reached_limit
+	cp  8
+	jr nz, .finish
+.reached_limit
 	call BattleBGEffects_IncrementJumptable
-.asm_c8879
+.finish
 	call Functionc88a5
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	ld hl, BG_EFFECT_STRUCT_03
@@ -1516,7 +1526,7 @@
 	ld [hl], a
 	ret
 
-Functionc8888: ; c8888 (32:4888)
+Tackle_BGEffect25_2d_two:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -1525,7 +1535,7 @@
 	call BattleBGEffects_IncrementJumptable
 .asm_c8893
 	call Functionc88a5
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	xor $ff
@@ -1540,15 +1550,15 @@
 	push af
 	ld a, [FXAnimIDHi] ; FXAnimIDHi
 	or a
-	jr nz, .asm_c88b3
+	jr nz, .not_rollout
 	ld a, [FXAnimIDLo] ; FXAnimID
 	cp ROLLOUT
-	jr z, .asm_c88b7
-.asm_c88b3
+	jr z, .rollout
+.not_rollout
 	pop af
 	jp Functionc900b
 
-.asm_c88b7
+.rollout
 	ld a, [hLCDStatCustom + 1]
 	ld d, a
 	ld a, [hLCDStatCustom + 2]
@@ -1557,53 +1567,53 @@
 	ld h, LYOverridesBackup / $100
 	ld a, [hSCY]
 	or a
-	jr nz, .asm_c88d0
+	jr nz, .skip1
 	ld a, [hLCDStatCustom + 1]
 	or a
-	jr z, .asm_c88d6
+	jr z, .skip2
 	dec a
 	ld l, a
 	ld [hl], $0
-	jr .asm_c88d6
+	jr .skip2
 
-.asm_c88d0
+.skip1
 	ld a, [hLCDStatCustom + 2]
 	dec a
 	ld l, a
 	ld [hl], $0
-.asm_c88d6
+.skip2
 	ld a, [hSCY]
 	ld l, a
 	ld a, [hLCDStatCustom + 1]
 	sub l
-	jr nc, .asm_c88e0
+	jr nc, .skip3
 	xor a
 	dec d
-.asm_c88e0
+.skip3
 	ld l, a
 	pop af
-.asm_c88e2
+.loop
 	ld [hli], a
 	dec d
-	jr nz, .asm_c88e2
+	jr nz, .loop
 	ret
 
 BattleBGEffect_2d: ; c88e7 (32:48e7)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc88f6
-	dw Functionc8869
-	dw Functionc8888
-	dw Functionc88f2
+	dw BGEffect2d_2f_zero
+	dw Tackle_BGEffect25_2d_one
+	dw Tackle_BGEffect25_2d_two
+	dw .three
 
 
-Functionc88f2: ; c88f2 (32:48f2)
+.three
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-Functionc88f6: ; c88f6 (32:48f6)
+BGEffect2d_2f_zero:
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -1612,14 +1622,14 @@
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], $0
-	call Functionc9038
-	jr nz, .asm_c8915
-	ld a, $fe
-	jr .asm_c8917
+	call BGEffect_CheckBattleTurn
+	jr nz, .player_turn
+	ld a, -2
+	jr .okay
 
-.asm_c8915
-	ld a, $2
-.asm_c8917
+.player_turn
+	ld a, 2
+.okay
 	ld [hl], a
 	ret
 
@@ -1626,17 +1636,15 @@
 BattleBGEffect_2f: ; c8919 (32:4919)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc88f6
-	dw Functionc8869
-	dw Functionc8929
-	dw Functionc8888
-	dw Functionc8926
+	dw BGEffect2d_2f_zero
+	dw Tackle_BGEffect25_2d_one
+	dw .two
+	dw Tackle_BGEffect25_2d_two
+	dw .four
 
-
-Functionc8926: ; c8926 (32:4926)
+.four
 	call BattleAnim_ResetLCDStatCustom
-
-Functionc8929: ; c8929 (32:4929)
+.two
 	ret
 
 BattleBGEffect_26: ; c892a (32:492a)
@@ -1649,7 +1657,7 @@
 
 Functionc8933: ; c8933 (32:4933)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -1688,7 +1696,7 @@
 
 Functionc896d: ; c896d (32:496d)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -1695,7 +1703,7 @@
 	inc a
 	ld [hLCDStatCustom + 2], a
 	xor a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hli], a
 	ld [hl], a
@@ -1708,7 +1716,7 @@
 	ld d, $6
 	call BattleBGEffects_Sine
 	push af
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	ld d, $2
@@ -1717,7 +1725,7 @@
 	pop af
 	add e
 	call Functionc900b
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	add $8
@@ -1743,7 +1751,7 @@
 
 Functionc89be: ; c89be (32:49be)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ret
@@ -1756,7 +1764,7 @@
 	ret nc
 	inc [hl]
 	ld d, a
-	ld e, $4
+	ld e, 4
 	call Functionc8f2e
 	ret
 
@@ -1768,7 +1776,7 @@
 	jr z, .asm_c89ea
 	dec [hl]
 	ld d, a
-	ld e, $4
+	ld e, 4
 	call Functionc8f2e
 	ret
 
@@ -1776,23 +1784,23 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_22: ; c89ee (32:49ee)
+BattleBGEffect_BounceDown: ; c89ee (32:49ee)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc89f7
-	dw Functionc8a14
-	dw Functionc8a36
+	dw .zero
+	dw .one
+	dw .two
 
 
-Functionc89f7: ; c89f7 (32:49f7)
+.zero
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $42
 	call Functionc8ef4
 	ld a, [hLCDStatCustom + 2]
 	inc a
 	ld [hLCDStatCustom + 2], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $1
 	ld hl, BG_EFFECT_STRUCT_03
@@ -1800,8 +1808,8 @@
 	ld [hl], $20
 	ret
 
-Functionc8a14: ; c8a14 (32:4a14)
-	ld hl, BG_EFFECT_STRUCT_02
+.one
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	cp $38
@@ -1824,7 +1832,7 @@
 endr
 	ret
 
-Functionc8a36: ; c8a36 (32:4a36)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
@@ -1831,18 +1839,17 @@
 BattleBGEffect_2a: ; c8a3a (32:4a3a)
 	call BattleBGEffects_AnonJumptable
 .anon_jumptable
-	dw Functionc8a49
-	dw Functionc8a6f
-	dw Functionc8a70
-	dw Functionc8a88
-	dw Functionc8a6f
-	dw Functionc8aac
+	dw .zero
+	dw .one
+	dw .two
+	dw .three
+	dw .four
+	dw .five
 
-
-Functionc8a49: ; c8a49 (32:4a49)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
-	call Functionc8ecb
+	call BattleBGEffects_SetLYOverrides
 	ld a, $47
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -1851,29 +1858,29 @@
 	ld a, [hLCDStatCustom + 1]
 	ld l, a
 	ld h, $d2
-.asm_c8a60
+.loop
 	ld a, [hLCDStatCustom + 2]
 	cp l
-	jr z, .asm_c8a69
+	jr z, .done
 	xor a
 	ld [hli], a
-	jr .asm_c8a60
+	jr .loop
 
-.asm_c8a69
+.done
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], $0
-
-Functionc8a6f: ; c8a6f (32:4a6f)
+.one
+.four
 	ret
 
-Functionc8a70: ; c8a70 (32:4a70)
-	call Functionc8ab0
-	jr nc, .asm_c8a79
-	call Functionc8a9a
+.two
+	call .GetLYOverride
+	jr nc, .next
+	call .SetLYOverridesBackup
 	ret
 
-.asm_c8a79
+.next
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld [hl], $0
@@ -1883,10 +1890,10 @@
 	call BattleBGEffects_IncrementJumptable
 	ret
 
-Functionc8a88: ; c8a88 (32:4a88)
-	call Functionc8ab0
-	jr nc, .asm_c8a96
-	call Functionc8a9a
+.three
+	call .GetLYOverride
+	jr nc, .finish
+	call .SetLYOverridesBackup
 	ld a, [hLCDStatCustom + 2]
 	dec a
 	ld l, a
@@ -1893,11 +1900,11 @@
 	ld [hl], e
 	ret
 
-.asm_c8a96
+.finish
 	call BattleBGEffects_IncrementJumptable
 	ret
 
-Functionc8a9a: ; c8a9a (32:4a9a)
+.SetLYOverridesBackup
 	ld e, a
 	ld a, [hLCDStatCustom + 1]
 	ld l, a
@@ -1904,21 +1911,21 @@
 	ld a, [hLCDStatCustom + 2]
 	sub l
 	srl a
-	ld h, $d2
-.asm_c8aa5
+	ld h, LYOverridesBackup / $100
+.loop2
 	ld [hl], e
 rept 2
 	inc hl
 endr
 	dec a
-	jr nz, .asm_c8aa5
+	jr nz, .loop2
 	ret
 
-Functionc8aac: ; c8aac (32:4aac)
+.five
 	call Functionc8f19
 	ret
 
-Functionc8ab0: ; c8ab0 (32:4ab0)
+.GetLYOverride
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -1928,16 +1935,15 @@
 	srl a
 	ld e, a
 	ld d, 0
-	ld hl, Unknown_c8ac7
+	ld hl, .data
 	add hl, de
 	ld a, [hl]
 	cp $ff
 	ret
 
-; c8ac7 (32:4ac7)
-
-Unknown_c8ac7:
-	db $00, $40, $90, $e4, $ff
+.data
+	db $00, $40, $90, $e4
+	db -1
 ; c8acc
 
 BattleBGEffect_2b: ; c8acc (32:4acc)
@@ -1949,16 +1955,16 @@
 
 Functionc8ad3: ; c8ad3 (32:4ad3)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $40
 	ret
 
 Functionc8ae5: ; c8ae5 (32:4ae5)
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -1991,7 +1997,7 @@
 Functionc8b0e: ; c8b0e (32:4b0e)
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
-	call Functionc8ecb
+	call BattleBGEffects_SetLYOverrides
 	ld a, $47
 	ld [hLCDStatCustom], a
 	xor a
@@ -2016,7 +2022,7 @@
 	ld e, a
 	ld d, $0
 	push bc
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	jr nz, .asm_c8b4d
 	ld hl, Unknown_c8bd8
 	add hl, de
@@ -2099,7 +2105,7 @@
 	sla a
 	ld e, a
 	ld d, 0
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	jr nz, .asm_c8bbb
 	ld hl, Unknown_c8bd8
 	add hl, de
@@ -2256,13 +2262,13 @@
 
 Functionc8c68: ; c8c68 (32:4c68)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
 	inc a
 	ld [hLCDStatCustom + 2], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], $1
 	ld hl, BG_EFFECT_STRUCT_03
@@ -2279,7 +2285,7 @@
 	dec [hl]
 	and $1
 	ret nz
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	xor $ff
@@ -2302,7 +2308,7 @@
 
 Functionc8cab: ; c8cab (32:4cab)
 	call BattleBGEffects_IncrementJumptable
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ld a, $43
 	ld [hLCDStatCustom], a
 	xor a
@@ -2385,7 +2391,7 @@
 	and $f
 	jr z, .asm_c8d2a
 	dec [hl]
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -2396,7 +2402,7 @@
 	swap a
 	or [hl]
 	ld [hl], a
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	xor $ff
@@ -2441,7 +2447,7 @@
 	ret
 
 .asm_c8d69
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
@@ -2469,7 +2475,7 @@
 Functionc8d8b: ; c8d8b (32:4d8b)
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
-	call Functionc8ecb
+	call BattleBGEffects_SetLYOverrides
 	ld a, $47
 	call Functionc8ede
 	ld a, [hLCDStatCustom + 2]
@@ -2479,13 +2485,13 @@
 	add hl, bc
 	ld a, [hl]
 	ld [hl], $0
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], a
 	ret
 
 Functionc8daa: ; c8daa (32:4daa)
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and $f
@@ -2532,7 +2538,7 @@
 
 
 Functionc8de7: ; c8de7 (32:4de7)
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	jr nz, .asm_c8df2
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_IncrementJumptable
@@ -2542,13 +2548,13 @@
 	add hl, bc
 	ld a, [hl]
 	ld [hl], $0
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld [hl], a
 	ret
 
 Functionc8e02: ; c8e02 (32:4e02)
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and $f
@@ -2579,7 +2585,7 @@
 	ret
 
 Functionc8e2a: ; c8e2a (32:4e2a)
-	ld hl, BG_EFFECT_STRUCT_02
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
 	and $f
@@ -2690,34 +2696,33 @@
 	scf
 	ret
 
-Functionc8eca: ; c8eca (32:4eca)
+BattleBGEffects_ClearLYOverrides: ; c8eca (32:4eca)
 	xor a
-
-Functionc8ecb: ; c8ecb (32:4ecb)
+BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
 	ld hl, LYOverrides ; wd100
 	ld e, $99
-.asm_c8ed0
+.loop1
 	ld [hli], a
 	dec e
-	jr nz, .asm_c8ed0
+	jr nz, .loop1
 	ld hl, LYOverridesBackup
 	ld e, $91
-.asm_c8ed9
+.loop2
 	ld [hli], a
 	dec e
-	jr nz, .asm_c8ed9
+	jr nz, .loop2
 	ret
 
 Functionc8ede: ; c8ede (32:4ede)
 	ld [hLCDStatCustom], a
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	jr nz, .asm_c8eea
 	ld de, $36
-	jr .asm_c8eed
+	jr .okay
 
 .asm_c8eea
 	ld de, $2f5e
-.asm_c8eed
+.okay
 	ld a, d
 	ld [hLCDStatCustom + 1], a
 	ld a, e
@@ -2726,7 +2731,7 @@
 
 Functionc8ef4: ; c8ef4 (32:4ef4)
 	ld [hLCDStatCustom], a
-	call Functionc9038
+	call BGEffect_CheckBattleTurn
 	jr nz, .asm_c8f00
 	ld de, $36
 	jr .asm_c8f03
@@ -2744,7 +2749,7 @@
 	xor a
 	ld [hLCDStatCustom + 1], a
 	ld [hLCDStatCustom + 2], a
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	xor a
 	ld [hLCDStatCustom], a
 	call EndBattleBGEffect
@@ -2759,7 +2764,7 @@
 	ld [wOBP1], a
 	ld [hLCDStatCustom + 1], a
 	ld [hLCDStatCustom + 2], a
-	call Functionc8eca
+	call BattleBGEffects_ClearLYOverrides
 	ret
 
 Functionc8f2e: ; c8f2e (32:4f2e)
@@ -2773,19 +2778,19 @@
 	ld a, $80
 	ld [wBattleAnimTemp3], a
 	ld bc, LYOverridesBackup
-.asm_c8f43
+.loop
 	ld a, [hLCDStatCustom + 1]
 	cp c
-	jr nc, .asm_c8f58
+	jr nc, .next
 	ld a, [hLCDStatCustom + 2]
 	cp c
-	jr c, .asm_c8f58
+	jr c, .next
 	ld a, [wBattleAnimTemp2]
 	ld d, a
 	ld a, [wBattleAnimTemp0]
 	call BattleBGEffects_Sine
 	ld [bc], a
-.asm_c8f58
+.next
 	inc bc
 	ld a, [wBattleAnimTemp1]
 	ld hl, wBattleAnimTemp0
@@ -2793,7 +2798,7 @@
 	ld [hl], a
 	ld hl, wBattleAnimTemp3
 	dec [hl]
-	jr nz, .asm_c8f43
+	jr nz, .loop
 	pop bc
 	ret
 
@@ -2832,15 +2837,15 @@
 	ld [wBattleAnimTemp1], a
 	ld a, d
 	ld [wBattleAnimTemp2], a
-	call Functionc8fe4
+	call .GetLYOverrideBackupAddrOffset
 	ld hl, LYOverridesBackup
 	add hl, de
 	ld c, l
 	ld b, h
-.asm_c8faf
+.loop
 	ld a, [wBattleAnimTemp3]
 	and a
-	jr z, .asm_c8fe1
+	jr z, .done
 	dec a
 	ld [wBattleAnimTemp3], a
 	push af
@@ -2853,29 +2858,29 @@
 	pop hl
 	ld a, [hLCDStatCustom + 2]
 	cp c
-	jr c, .asm_c8fcf
+	jr c, .skip1
 	ld a, e
 	ld [bc], a
 	inc bc
-.asm_c8fcf
+.skip1
 	ld a, [hLCDStatCustom + 1]
 	cp l
-	jr nc, .asm_c8fd6
+	jr nc, .skip2
 	ld [hl], e
 	dec hl
-.asm_c8fd6
+.skip2
 	ld a, [wBattleAnimTemp1]
 	add $4
 	ld [wBattleAnimTemp1], a
 	pop af
-	jr .asm_c8faf
+	jr .loop
 
-.asm_c8fe1
+.done
 	pop bc
 	and a
 	ret
 
-Functionc8fe4: ; c8fe4 (32:4fe4)
+.GetLYOverrideBackupAddrOffset
 	ld a, [hLCDStatCustom + 1]
 	ld e, a
 	ld a, [wBattleAnimTemp0]
@@ -2884,7 +2889,7 @@
 	ld d, $0
 	ret
 
-Functionc8fef: ; c8fef (32:4fef)
+BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
 	push bc
 	ld a, [hLCDStatCustom + 1]
 	ld l, a
@@ -2895,19 +2900,19 @@
 	ld a, [hLCDStatCustom + 2]
 	sub l
 	and a
-	jr z, .asm_c9009
+	jr z, .done
 	ld c, a
 	ld a, [hl]
 	push af
-.asm_c9001
+.loop
 	ld a, [de]
 	inc de
 	ld [hli], a
 	dec c
-	jr nz, .asm_c9001
+	jr nz, .loop
 	pop af
 	ld [hl], a
-.asm_c9009
+.done
 	pop bc
 	ret
 
@@ -2951,8 +2956,8 @@
 	jr nz, .asm_c9033
 	ret
 
-Functionc9038: ; c9038 (32:5038)
-	ld hl, BG_EFFECT_STRUCT_02
+BGEffect_CheckBattleTurn: ; c9038 (32:5038)
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hBattleTurn]
 	and $1
@@ -2959,18 +2964,18 @@
 	xor [hl]
 	ret
 
-Functionc9042: ; c9042 (32:5042)
-	ld hl, BG_EFFECT_STRUCT_02
+BGEffect_CheckFlyDigStatus: ; c9042 (32:5042)
+	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hBattleTurn]
 	and $1
 	xor [hl]
-	jr nz, .asm_c9053
+	jr nz, .player
 	ld a, [EnemySubStatus3] ; EnemySubStatus3
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret
 
-.asm_c9053
+.player
 	ld a, [PlayerSubStatus3] ; PlayerSubStatus3
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret
--- a/battle/objects/framesets.asm
+++ b/battle/objects/framesets.asm
@@ -1,557 +1,1270 @@
-BattleAnimFrameData: ; ce85e
-	dw Unknown_ce9d0 ; 00
-	dw Unknown_ce9d3 ; 01
-	dw Unknown_ce9d6 ; 02
-	dw Unknown_ce9d9 ; 03
-	dw Unknown_ce9dc ; 04
-	dw Unknown_ce9df ; 05
-	dw Unknown_ce9e2 ; 06
-	dw Unknown_ce9e5 ; 07
-	dw Unknown_cea6b ; 08
-	dw Unknown_cea74 ; 09
-	dw Unknown_cea7d ; 0a
-	dw Unknown_cea80 ; 0b
-	dw Unknown_cea83 ; 0c
-	dw Unknown_cea86 ; 0d
-	dw Unknown_cea91 ; 0e
-	dw Unknown_cea94 ; 0f
-	dw Unknown_cea99 ; 10
-	dw Unknown_cea9e ; 11
-	dw Unknown_ceaaf ; 12
-	dw Unknown_ceabc ; 13
-	dw Unknown_cead3 ; 14
-	dw Unknown_cead6 ; 15
-	dw Unknown_ceadb ; 16
-	dw Unknown_ceade ; 17
-	dw Unknown_ceb06 ; 18
-	dw Unknown_ceb0d ; 19
-	dw Unknown_ceb10 ; 1a
-	dw Unknown_ceb13 ; 1b
-	dw Unknown_ceb16 ; 1c
-	dw Unknown_ceb19 ; 1d
-	dw Unknown_ceb1c ; 1e
-	dw Unknown_ceb1f ; 1f
-	dw Unknown_ceb26 ; 20
-	dw Unknown_ceb2b ; 21
-	dw Unknown_ceb2e ; 22
-	dw Unknown_ceb37 ; 23
-	dw Unknown_ceb3a ; 24
-	dw Unknown_ceb3d ; 25
-	dw Unknown_ceb40 ; 26
-	dw Unknown_ceb43 ; 27
-	dw Unknown_ceb46 ; 28
-	dw Unknown_ceb4b ; 29
-	dw Unknown_ceb50 ; 2a
-	dw Unknown_ceb63 ; 2b
-	dw Unknown_ceb68 ; 2c
-	dw Unknown_ceb6d ; 2d
-	dw Unknown_ceb70 ; 2e
-	dw Unknown_ceb78 ; 2f
-	dw Unknown_ceb89 ; 30
-	dw Unknown_ceb8e ; 31
-	dw Unknown_ceb97 ; 32
-	dw Unknown_ceba0 ; 33
-	dw Unknown_ceba9 ; 34
-	dw Unknown_cebb0 ; 35
-	dw Unknown_cebc1 ; 36
-	dw Unknown_cebca ; 37
-	dw Unknown_cebcf ; 38
-	dw Unknown_cebd4 ; 39
-	dw Unknown_cebd9 ; 3a
-	dw Unknown_cebdc ; 3b
-	dw Unknown_cebdf ; 3c
-	dw Unknown_cebe2 ; 3d
-	dw Unknown_ce9f6 ; 3e
-	dw Unknown_cea0b ; 3f
-	dw Unknown_cea20 ; 40
-	dw Unknown_cea35 ; 41
-	dw Unknown_cea50 ; 42
-	dw Unknown_cebe5 ; 43
-	dw Unknown_cebf3 ; 44
-	dw Unknown_cec0f ; 45
-	dw Unknown_cec20 ; 46
-	dw Unknown_cec25 ; 47
-	dw Unknown_cec2a ; 48
-	dw Unknown_cec37 ; 49
-	dw Unknown_cec44 ; 4a
-	dw Unknown_cec4d ; 4b
-	dw Unknown_cebec ; 4c
-	dw Unknown_cec56 ; 4d
-	dw Unknown_cec67 ; 4e
-	dw Unknown_cec72 ; 4f
-	dw Unknown_cec77 ; 50
-	dw Unknown_cec7c ; 51
-	dw Unknown_cec7f ; 52
-	dw Unknown_cec86 ; 53
-	dw Unknown_cec8b ; 54
-	dw Unknown_cec92 ; 55
-	dw Unknown_ceaf3 ; 56
-	dw Unknown_ceaf6 ; 57
-	dw Unknown_ceb01 ; 58
-	dw Unknown_cec97 ; 59
-	dw Unknown_cec9a ; 5a
-	dw Unknown_cec9d ; 5b
-	dw Unknown_ceca0 ; 5c
-	dw Unknown_cecab ; 5d
-	dw Unknown_cecb0 ; 5e
-	dw Unknown_cecc9 ; 5f
-	dw Unknown_ceccc ; 60
-	dw Unknown_cece7 ; 61
-	dw Unknown_cecec ; 62
-	dw Unknown_cecf1 ; 63
-	dw Unknown_cecf4 ; 64
-	dw Unknown_cecf7 ; 65
-	dw Unknown_cecfa ; 66
-	dw Unknown_ced09 ; 67
-	dw Unknown_ced0c ; 68
-	dw Unknown_ced19 ; 69
-	dw Unknown_ced22 ; 6a
-	dw Unknown_ced2b ; 6b
-	dw Unknown_ced32 ; 6c
-	dw Unknown_ced39 ; 6d
-	dw Unknown_ced3c ; 6e
-	dw Unknown_ced3f ; 6f
-	dw Unknown_ced44 ; 70
-	dw Unknown_ced49 ; 71
-	dw Unknown_ced4c ; 72
-	dw Unknown_ced4f ; 73
-	dw Unknown_ced54 ; 74
-	dw Unknown_ced57 ; 75
-	dw Unknown_ced5a ; 76
-	dw Unknown_ced5d ; 77
-	dw Unknown_ced62 ; 78
-	dw Unknown_ced65 ; 79
-	dw Unknown_cecb3 ; 7a
-	dw Unknown_ced72 ; 7b
-	dw Unknown_ced75 ; 7c
-	dw Unknown_ced88 ; 7d
-	dw Unknown_cec08 ; 7e
-	dw Unknown_ced8b ; 7f
-	dw Unknown_ced8e ; 80
-	dw Unknown_ced91 ; 81
-	dw Unknown_ced93 ; 82
-	dw Unknown_ced95 ; 83
-	dw Unknown_ced98 ; 84
-	dw Unknown_ced9b ; 85
-	dw Unknown_ceda8 ; 86
-	dw Unknown_cedb5 ; 87
-	dw Unknown_cedb8 ; 88
-	dw Unknown_cedbb ; 89
-	dw Unknown_cedbe ; 8a
-	dw Unknown_cedc1 ; 8b
-	dw Unknown_cedc4 ; 8c
-	dw Unknown_cedc7 ; 8d
-	dw Unknown_cedcc ; 8e
-	dw Unknown_cedcf ; 8f
-	dw Unknown_cedd2 ; 90
-	dw Unknown_cedd5 ; 91
-	dw Unknown_cedd8 ; 92
-	dw Unknown_ceddb ; 93
-	dw Unknown_cedde ; 94
-	dw Unknown_cede1 ; 95
-	dw Unknown_cede4 ; 96
-	dw Unknown_cede7 ; 97
-	dw Unknown_cedea ; 98
-	dw Unknown_ceded ; 99
-	dw Unknown_cedf0 ; 9a
-	dw Unknown_cedf3 ; 9b
-	dw Unknown_cedf6 ; 9c
-	dw Unknown_cedf9 ; 9d
-	dw Unknown_cedfc ; 9e
-	dw Unknown_cedff ; 9f
-	dw Unknown_cee02 ; a0
-	dw Unknown_cee05 ; a1
-	dw Unknown_cee08 ; a2
-	dw Unknown_cee0b ; a3
-	dw Unknown_cee12 ; a4
-	dw Unknown_cee19 ; a5
-	dw Unknown_cee1e ; a6
-	dw Unknown_cee3d ; a7
-	dw Unknown_cee5c ; a8
-	dw Unknown_cee61 ; a9
-	dw Unknown_cee64 ; aa
-	dw Unknown_cee6b ; ab
-	dw Unknown_cee70 ; ac
-	dw Unknown_cee75 ; ad
-	dw Unknown_cee7e ; ae
-	dw Unknown_cecbe ; af
-	dw Unknown_cee81 ; b0
-	dw Unknown_cee84 ; b1
-	dw Unknown_cee8d ; b2
-	dw Unknown_cee96 ; b3
-	dw Unknown_cee9f ; b4
-	dw Unknown_ceea2 ; b5
-	dw Unknown_ceea5 ; b6
-	dw Unknown_ceea8 ; b7
-	dw Unknown_ceeab ; b8
-; ce9d0
-
-                ; OAM index (see battle/objects/oam.asm), flip flags / duration
-Unknown_ce9d0:	db $00,$06
-				db -4
-Unknown_ce9d3:	db $01,$06
-				db -4
-Unknown_ce9d6:	db $02,$06
-				db -4
-Unknown_ce9d9:	db $03,$06
-				db -4
-Unknown_ce9dc:	db $04,$06
-				db -4
-Unknown_ce9df:	db $05,$06
-				db -4
-Unknown_ce9e2:	db $06,$06
-				db -4
-Unknown_ce9e5:	db $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01
-				db -4
-Unknown_ce9f6:	db $4b,$02, $4c,$02, $4d,$04, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02
-				db -4
-Unknown_cea0b:	db $4b,$42, $4c,$42, $4d,$44, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42
-				db -4
-Unknown_cea20:	db $4b,$c2, $4c,$c2, $4d,$c4, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2
-				db -4
-Unknown_cea35:	db $4b,$01, $4c,$01, $4d,$01, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02
-				db -4
-Unknown_cea50:	db $4b,$41, $4c,$41, $4d,$41, $4f,$41, $50,$41, $51,$41, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42
-				db -4
-Unknown_cea6b:	db $00,$03, $07,$03, $08,$03, $09,$03
-				db -4
-Unknown_cea74:	db $0a,$07, $0b,$07, $0a,$07, $0b,$47
-				db -2
-Unknown_cea7d:	db $0c,$08
-				db -1
-Unknown_cea80:	db $0d,$08
-				db -1
-Unknown_cea83:	db $0a,$08
-				db -1
-Unknown_cea86:	db $0a,$07, $0b,$07, $0a,$07, $0b,$47, $0a,$07
-				db -1
-Unknown_cea91:	db $0a,$08
-				db -1
-Unknown_cea94:	db $0a,$04, $0e,$04
-				db -2
-Unknown_cea99:	db $0f,$04, $10,$04
-				db -2
-Unknown_cea9e:	db $10,$04, $0f,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04
-				db -4
-Unknown_ceaaf:	db $10,$01, $0f,$01, $12,$01, $11,$01, $12,$01, $0f,$01
-				db -2
-Unknown_ceabc:	db $10,$03, $0f,$03, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$03
-				db -4
-Unknown_cead3:	db $13,$14
-				db -4
-Unknown_cead6:	db $10,$01, $0f,$01
-				db -2
-Unknown_ceadb:	db $14,$08
-				db -1
-Unknown_ceade:	db $17,$04, $16,$08, $15,$08, $16,$08, $17,$04, $17,$04, $16,$48, $15,$48, $16,$48, $17,$04
-				db -2
-Unknown_ceaf3:	db $69,$08
-				db -1
-Unknown_ceaf6:	db $69,$20, $6a,$04, $6b,$04, $6d,$04, $6c,$04
-				db -1
-Unknown_ceb01:	db $6c,$08, $6d,$08
-				db -2
-Unknown_ceb06:	db $18,$04, $19,$04, $1a,$04
-				db -4
-Unknown_ceb0d:	db $1b,$08
-				db -1
-Unknown_ceb10:	db $0f,$08
-				db -1
-Unknown_ceb13:	db $1c,$08
-				db -1
-Unknown_ceb16:	db $0a,$08
-				db -4
-Unknown_ceb19:	db $1d,$08
-				db -1
-Unknown_ceb1c:	db $17,$08
-				db -1
-Unknown_ceb1f:	db $0f,$03, $10,$03, $1e,$03
-				db -1
-Unknown_ceb26:	db $1f,$10, $20,$03
-				db -4
-Unknown_ceb2b:	db $20,$08
-				db -1
-Unknown_ceb2e:	db $20,$08, $21,$08, $1b,$08, $21,$08
-				db -2
-Unknown_ceb37:	db $22,$08
-				db -1
-Unknown_ceb3a:	db $1b,$08
-				db -1
-Unknown_ceb3d:	db $23,$08
-				db -1
-Unknown_ceb40:	db $24,$08
-				db -1
-Unknown_ceb43:	db $25,$08
-				db -1
-Unknown_ceb46:	db $26,$08, $27,$08
-				db -1
-Unknown_ceb4b:	db $28,$08, $29,$08
-				db -4
-Unknown_ceb50:	db $2a,$01, $2b,$01, $2c,$01, $2d,$01, $2e,$01, $2d,$01, $2c,$01, $2b,$01, $2a,$01
-				db -4
-Unknown_ceb63:	db $14,$01, $15,$01
-				db -2
-Unknown_ceb68:	db $2f,$04, $30,$28
-				db -4
-Unknown_ceb6d:	db $31,$08
-				db -1
-Unknown_ceb70:	db $32,$20, $33,$20, $34,$20, $35,$20 ; fallthrough
-Unknown_ceb78:	db $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04
-				db -4
-Unknown_ceb89:	db $14,$04, $15,$04
-				db -2
-Unknown_ceb8e:	db $36,$02, $37,$02, $38,$02, $39,$20
-				db -4
-Unknown_ceb97:	db $3a,$02, $3b,$02, $3c,$02, $3d,$20
-				db -4
-Unknown_ceba0:	db $3a,$42, $3b,$42, $3c,$42, $3d,$60
-				db -4
-Unknown_ceba9:	db $3e,$08, $3f,$08, $40,$08
-				db -1
-Unknown_cebb0:	db $40,$02, $fd,$02, $40,$02, $fd,$02, $41,$02, $fd,$02, $41,$02, $fd,$02
-				db -2
-Unknown_cebc1:	db $42,$02, $43,$02, $44,$02, $45,$02
-				db -2
-Unknown_cebca:	db $19,$02, $fd,$02
-				db -2
-Unknown_cebcf:	db $46,$04, $47,$04
-				db -2
-Unknown_cebd4:	db $18,$02, $fd,$02
-				db -2
-Unknown_cebd9:	db $48,$08
-				db -1
-Unknown_cebdc:	db $48,$48
-				db -1
-Unknown_cebdf:	db $49,$08
-				db -1
-Unknown_cebe2:	db $4a,$08
-				db -1
-Unknown_cebe5:	db $20,$10, $1f,$10, $1e,$10
-				db -1
-Unknown_cebec:	db $20,$08, $1f,$08, $1e,$08
-				db -1
-Unknown_cebf3:	db $fd,$14, $55,$28, $54,$28, $53,$14, $fd,$04, $53,$04, $fd,$04, $53,$04, $fd,$04, $53,$04
-				db -4
-Unknown_cec08:	db $1e,$08, $1f,$08, $20,$08
-				db -4
-Unknown_cec0f:	db $fd,$00, $14,$00, $15,$00, $14,$40, $fd,$00, $16,$40, $15,$00, $16,$00
-				db -2
-Unknown_cec20:	db $56,$02, $57,$04
-				db -4
-Unknown_cec25:	db $56,$c2, $57,$c4
-				db -4
-Unknown_cec2a:	db $56,$01, $57,$01, $58,$01, $57,$c1, $58,$c1, $57,$02
-				db -4
-Unknown_cec37:	db $56,$c1, $57,$c1, $58,$c1, $57,$01, $58,$01, $57,$c2
-				db -4
-Unknown_cec44:	db $57,$c1, $58,$c1, $57,$01, $58,$01
-				db -2
-Unknown_cec4d:	db $59,$01, $5a,$01, $5b,$01, $5c,$02
-				db -4
-Unknown_cec56:	db $0a,$0a, $0b,$43, $5d,$43, $0b,$c3, $0a,$82, $0b,$81, $5d,$01, $0b,$01
-				db -2
-Unknown_cec67:	db $0a,$03, $0b,$47, $0a,$07, $0b,$07, $0a,$03
-				db -2
-Unknown_cec72:	db $5e,$20, $5e,$20
-				db -4
-Unknown_cec77:	db $5f,$20, $5f,$20
-				db -4
-Unknown_cec7c:	db $60,$08
-				db -1
-Unknown_cec7f:	db $61,$01, $62,$01, $63,$01
-				db -1
-Unknown_cec86:	db $63,$07, $64,$07
-				db -2
-Unknown_cec8b:	db $65,$01, $66,$01, $67,$01
-				db -1
-Unknown_cec92:	db $67,$07, $68,$07
-				db -2
-Unknown_cec97:	db $6e,$08
-				db -1
-Unknown_cec9a:	db $6f,$08
-				db -1
-Unknown_cec9d:	db $6e,$88
-				db -1
-Unknown_ceca0:	db $18,$04, $70,$04, $71,$04, $72,$04, $73,$04
-				db -4
-Unknown_cecab:	db $74,$04, $75,$04
-				db -2
-Unknown_cecb0:	db $14,$08
-				db -1
-Unknown_cecb3:	db $74,$03, $14,$03, $15,$03, $14,$03, $15,$03
-				db -4
-Unknown_cecbe:	db $14,$00, $15,$00, $14,$00, $15,$00, $74,$0c
-				db -4
-Unknown_cecc9:	db $76,$08
-				db -1
-Unknown_ceccc:	db $77,$01, $78,$01, $79,$01, $7a,$01, $7b,$01, $7c,$01, $7d,$01, $7c,$c1, $7b,$c1, $7a,$c1, $79,$c1, $78,$c1, $77,$c1
-				db -4
-Unknown_cece7:	db $1b,$04, $7e,$04
-				db -2
-Unknown_cecec:	db $1b,$44, $7e,$44
-				db -2
-Unknown_cecf1:	db $7f,$08
-				db -1
-Unknown_cecf4:	db $25,$08
-				db -1
-Unknown_cecf7:	db $80,$08
-				db -1
-Unknown_cecfa:	db $83,$07, $82,$07, $81,$07, $82,$07, $83,$07, $82,$07, $81,$07
-				db -4
-Unknown_ced09:	db $1b,$10
-				db -4
-Unknown_ced0c:	db $fd,$0f, $84,$0f, $85,$0f, $29,$0f, $28,$0f, $86,$20
-				db -4
-Unknown_ced19:	db $1b,$03, $87,$03, $88,$03, $89,$03
-				db -4
-Unknown_ced22:	db $8a,$02, $8b,$02, $8c,$02, $8d,$02
-				db -4
-Unknown_ced2b:	db $61,$02, $62,$02, $63,$02
-				db -1
-Unknown_ced32:	db $65,$02, $66,$02, $67,$02
-				db -1
-Unknown_ced39:	db $8e,$08
-				db -1
-Unknown_ced3c:	db $8e,$48
-				db -1
-Unknown_ced3f:	db $8f,$10, $90,$10
-				db -2
-Unknown_ced44:	db $91,$10, $92,$10
-				db -2
-Unknown_ced49:	db $93,$08
-				db -1
-Unknown_ced4c:	db $1e,$08
-				db -1
-Unknown_ced4f:	db $1b,$07, $94,$07
-				db -2
-Unknown_ced54:	db $95,$08
-				db -1
-Unknown_ced57:	db $96,$08
-				db -1
-Unknown_ced5a:	db $95,$08
-				db -1
-Unknown_ced5d:	db $97,$01, $97,$41
-				db -2
-Unknown_ced62:	db $98,$08
-				db -1
-Unknown_ced65:	db $99,$20, $99,$20, $99,$20, $99,$20, $99,$20, $9a,$08
-				db -1
-Unknown_ced72:	db $9b,$08
-				db -1
-Unknown_ced75:	db $9c,$02, $9d,$02, $9e,$08, $fd,$02, $9e,$02, $fd,$02, $9e,$02, $fd,$02, $9e,$02
-				db -4
-Unknown_ced88:	db $9f,$08
-				db -1
-Unknown_ced8b:	db $0f,$08
-				db -1
-Unknown_ced8e:	db $6b,$18
-				db -4
-Unknown_ced91:	db $a0,$01 ; fallthrough
-Unknown_ced93:	db $a1,$01 ; fallthrough
-Unknown_ced95:	db $a2,$01
-				db -4
-Unknown_ced98:	db $a3,$08
-				db -1
-Unknown_ced9b:	db $a4,$04, $a5,$04, $a6,$04, $a7,$04, $a6,$44, $a5,$44
-				db -2
-Unknown_ceda8:	db $a8,$04, $a9,$04, $aa,$04, $ab,$04, $aa,$44, $a9,$44
-				db -2
-Unknown_cedb5:	db $1b,$08
-				db -1
-Unknown_cedb8:	db $ac,$08
-				db -1
-Unknown_cedbb:	db $ad,$08
-				db -1
-Unknown_cedbe:	db $ae,$08
-				db -1
-Unknown_cedc1:	db $af,$08
-				db -1
-Unknown_cedc4:	db $b0,$20
-				db -4
-Unknown_cedc7:	db $b1,$07, $b1,$47
-				db -2
-Unknown_cedcc:	db $b2,$08
-				db -1
-Unknown_cedcf:	db $b3,$08
-				db -1
-Unknown_cedd2:	db $b3,$48
-				db -1
-Unknown_cedd5:	db $b3,$88
-				db -1
-Unknown_cedd8:	db $b3,$c8
-				db -1
-Unknown_ceddb:	db $b5,$08
-				db -1
-Unknown_cedde:	db $b5,$48
-				db -1
-Unknown_cede1:	db $b5,$88
-				db -1
-Unknown_cede4:	db $b5,$c8
-				db -1
-Unknown_cede7:	db $b4,$08
-				db -1
-Unknown_cedea:	db $6b,$08
-				db -1
-Unknown_ceded:	db $b6,$08
-				db -1
-Unknown_cedf0:	db $b7,$20
-				db -1
-Unknown_cedf3:	db $1b,$20
-				db -1
-Unknown_cedf6:	db $b8,$20
-				db -1
-Unknown_cedf9:	db $b8,$60
-				db -1
-Unknown_cedfc:	db $b9,$20
-				db -1
-Unknown_cedff:	db $ba,$20
-				db -1
-Unknown_cee02:	db $bb,$60
-				db -1
-Unknown_cee05:	db $bb,$20
-				db -1
-Unknown_cee08:	db $bc,$20
-				db -1
-Unknown_cee0b:	db $bd,$0b, $be,$0b, $1b,$0b
-				db -4
-Unknown_cee12:	db $bf,$04, $c0,$04, $c1,$04
-				db -4
-Unknown_cee19:	db $c2,$20, $c2,$20
-				db -4
-Unknown_cee1e:	db $4b,$02, $4c,$02, $4d,$20, $4d,$20, $4d,$20, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02
-				db -4
-Unknown_cee3d:	db $4b,$c2, $4c,$c2, $4d,$e0, $4d,$e0, $4d,$e0, $4f,$c1, $50,$c1, $51,$c1, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2
-				db -4
-Unknown_cee5c:	db $c3,$01, $c3,$c1
-				db -2
-Unknown_cee61:	db $c4,$20
-				db -1
-Unknown_cee64:	db $c5,$04, $c6,$04, $c7,$04
-				db -4
-Unknown_cee6b:	db $c8,$01, $c8,$41
-				db -2
-Unknown_cee70:	db $c9,$03, $05,$03
-				db -4
-Unknown_cee75:	db $ca,$20, $cb,$03, $ca,$03, $cb,$03
-				db -2
-Unknown_cee7e:	db $03,$a0
-				db -1
-Unknown_cee81:	db $cc,$20
-				db -1
-Unknown_cee84:	db $7f,$02, $25,$02, $80,$02, $25,$02
-				db -2
-Unknown_cee8d:	db $cd,$04, $ce,$04, $cd,$c4, $ce,$c4
-				db -2
-Unknown_cee96:	db $cf,$04, $d0,$04, $d1,$04, $d2,$04
-				db -4
-Unknown_cee9f:	db $d3,$20
-				db -1
-Unknown_ceea2:	db $d4,$08
-				db -1
-Unknown_ceea5:	db $d5,$08
-				db -1
-Unknown_ceea8:	db $d6,$08
-				db -1
-Unknown_ceeab:	db $d7,$08
-				db -1
-; ceeae
+BattleAnimFrameData: ; ce85e
+	dw .Frameset_00 ; 00
+	dw .Frameset_01 ; 01
+	dw .Frameset_02 ; 02
+	dw .Frameset_03 ; 03
+	dw .Frameset_04 ; 04
+	dw .Frameset_05 ; 05
+	dw .Frameset_06 ; 06
+	dw .Frameset_07 ; 07
+	dw .Frameset_08 ; 08
+	dw .Frameset_09 ; 09
+	dw .Frameset_0a ; 0a
+	dw .Frameset_0b ; 0b
+	dw .Frameset_0c ; 0c
+	dw .Frameset_0d ; 0d
+	dw .Frameset_0e ; 0e
+	dw .Frameset_0f ; 0f
+	dw .Frameset_10 ; 10
+	dw .Frameset_11 ; 11
+	dw .Frameset_12 ; 12
+	dw .Frameset_13 ; 13
+	dw .Frameset_14 ; 14
+	dw .Frameset_15 ; 15
+	dw .Frameset_16 ; 16
+	dw .Frameset_17 ; 17
+	dw .Frameset_18 ; 18
+	dw .Frameset_19 ; 19
+	dw .Frameset_1a ; 1a
+	dw .Frameset_1b ; 1b
+	dw .Frameset_1c ; 1c
+	dw .Frameset_1d ; 1d
+	dw .Frameset_1e ; 1e
+	dw .Frameset_1f ; 1f
+	dw .Frameset_20 ; 20
+	dw .Frameset_21 ; 21
+	dw .Frameset_22 ; 22
+	dw .Frameset_23 ; 23
+	dw .Frameset_24 ; 24
+	dw .Frameset_25 ; 25
+	dw .Frameset_26 ; 26
+	dw .Frameset_27 ; 27
+	dw .Frameset_28 ; 28
+	dw .Frameset_29 ; 29
+	dw .Frameset_2a ; 2a
+	dw .Frameset_2b ; 2b
+	dw .Frameset_2c ; 2c
+	dw .Frameset_2d ; 2d
+	dw .Frameset_2e ; 2e
+	dw .Frameset_2f ; 2f
+	dw .Frameset_30 ; 30
+	dw .Frameset_31 ; 31
+	dw .Frameset_32 ; 32
+	dw .Frameset_33 ; 33
+	dw .Frameset_34 ; 34
+	dw .Frameset_35 ; 35
+	dw .Frameset_36 ; 36
+	dw .Frameset_37 ; 37
+	dw .Frameset_38 ; 38
+	dw .Frameset_39 ; 39
+	dw .Frameset_3a ; 3a
+	dw .Frameset_3b ; 3b
+	dw .Frameset_3c ; 3c
+	dw .Frameset_3d ; 3d
+	dw .Frameset_3e ; 3e
+	dw .Frameset_3f ; 3f
+	dw .Frameset_40 ; 40
+	dw .Frameset_41 ; 41
+	dw .Frameset_42 ; 42
+	dw .Frameset_43 ; 43
+	dw .Frameset_44 ; 44
+	dw .Frameset_45 ; 45
+	dw .Frameset_46 ; 46
+	dw .Frameset_47 ; 47
+	dw .Frameset_48 ; 48
+	dw .Frameset_49 ; 49
+	dw .Frameset_4a ; 4a
+	dw .Frameset_4b ; 4b
+	dw .Frameset_4c ; 4c
+	dw .Frameset_4d ; 4d
+	dw .Frameset_4e ; 4e
+	dw .Frameset_4f ; 4f
+	dw .Frameset_50 ; 50
+	dw .Frameset_51 ; 51
+	dw .Frameset_52 ; 52
+	dw .Frameset_53 ; 53
+	dw .Frameset_54 ; 54
+	dw .Frameset_55 ; 55
+	dw .Frameset_56 ; 56
+	dw .Frameset_57 ; 57
+	dw .Frameset_58 ; 58
+	dw .Frameset_59 ; 59
+	dw .Frameset_5a ; 5a
+	dw .Frameset_5b ; 5b
+	dw .Frameset_5c ; 5c
+	dw .Frameset_5d ; 5d
+	dw .Frameset_5e ; 5e
+	dw .Frameset_5f ; 5f
+	dw .Frameset_60 ; 60
+	dw .Frameset_61 ; 61
+	dw .Frameset_62 ; 62
+	dw .Frameset_63 ; 63
+	dw .Frameset_64 ; 64
+	dw .Frameset_65 ; 65
+	dw .Frameset_66 ; 66
+	dw .Frameset_67 ; 67
+	dw .Frameset_68 ; 68
+	dw .Frameset_69 ; 69
+	dw .Frameset_6a ; 6a
+	dw .Frameset_6b ; 6b
+	dw .Frameset_6c ; 6c
+	dw .Frameset_6d ; 6d
+	dw .Frameset_6e ; 6e
+	dw .Frameset_6f ; 6f
+	dw .Frameset_70 ; 70
+	dw .Frameset_71 ; 71
+	dw .Frameset_72 ; 72
+	dw .Frameset_73 ; 73
+	dw .Frameset_74 ; 74
+	dw .Frameset_75 ; 75
+	dw .Frameset_76 ; 76
+	dw .Frameset_77 ; 77
+	dw .Frameset_78 ; 78
+	dw .Frameset_79 ; 79
+	dw .Frameset_7a ; 7a
+	dw .Frameset_7b ; 7b
+	dw .Frameset_7c ; 7c
+	dw .Frameset_7d ; 7d
+	dw .Frameset_7e ; 7e
+	dw .Frameset_7f ; 7f
+	dw .Frameset_80 ; 80
+	dw .Frameset_81 ; 81
+	dw .Frameset_82 ; 82
+	dw .Frameset_83 ; 83
+	dw .Frameset_84 ; 84
+	dw .Frameset_85 ; 85
+	dw .Frameset_86 ; 86
+	dw .Frameset_87 ; 87
+	dw .Frameset_88 ; 88
+	dw .Frameset_89 ; 89
+	dw .Frameset_8a ; 8a
+	dw .Frameset_8b ; 8b
+	dw .Frameset_8c ; 8c
+	dw .Frameset_8d ; 8d
+	dw .Frameset_8e ; 8e
+	dw .Frameset_8f ; 8f
+	dw .Frameset_90 ; 90
+	dw .Frameset_91 ; 91
+	dw .Frameset_92 ; 92
+	dw .Frameset_93 ; 93
+	dw .Frameset_94 ; 94
+	dw .Frameset_95 ; 95
+	dw .Frameset_96 ; 96
+	dw .Frameset_97 ; 97
+	dw .Frameset_98 ; 98
+	dw .Frameset_99 ; 99
+	dw .Frameset_9a ; 9a
+	dw .Frameset_9b ; 9b
+	dw .Frameset_9c ; 9c
+	dw .Frameset_9d ; 9d
+	dw .Frameset_9e ; 9e
+	dw .Frameset_9f ; 9f
+	dw .Frameset_a0 ; a0
+	dw .Frameset_a1 ; a1
+	dw .Frameset_a2 ; a2
+	dw .Frameset_a3 ; a3
+	dw .Frameset_a4 ; a4
+	dw .Frameset_a5 ; a5
+	dw .Frameset_a6 ; a6
+	dw .Frameset_a7 ; a7
+	dw .Frameset_a8 ; a8
+	dw .Frameset_a9 ; a9
+	dw .Frameset_aa ; aa
+	dw .Frameset_ab ; ab
+	dw .Frameset_ac ; ac
+	dw .Frameset_ad ; ad
+	dw .Frameset_ae ; ae
+	dw .Frameset_af ; af
+	dw .Frameset_b0 ; b0
+	dw .Frameset_b1 ; b1
+	dw .Frameset_b2 ; b2
+	dw .Frameset_b3 ; b3
+	dw .Frameset_b4 ; b4
+	dw .Frameset_b5 ; b5
+	dw .Frameset_b6 ; b6
+	dw .Frameset_b7 ; b7
+	dw .Frameset_b8 ; b8
+
+     ; OAM index (see battle/objects/oam.asm), flip flags / duration
+.Frameset_00 
+	db BATTLEANIMOAMSET_00, $06
+	db -4
+
+.Frameset_01 
+	db BATTLEANIMOAMSET_01, $06
+	db -4
+
+.Frameset_02 
+	db BATTLEANIMOAMSET_02, $06
+	db -4
+
+.Frameset_03 
+	db BATTLEANIMOAMSET_03, $06
+	db -4
+
+.Frameset_04 
+	db BATTLEANIMOAMSET_04, $06
+	db -4
+
+.Frameset_05 
+	db BATTLEANIMOAMSET_05, $06
+	db -4
+
+.Frameset_06 
+	db BATTLEANIMOAMSET_06, $06
+	db -4
+
+.Frameset_07 
+	db BATTLEANIMOAMSET_03, $04
+	db BATTLEANIMOAMSET_01, $01
+	db BATTLEANIMOAMSET_03, $04
+	db BATTLEANIMOAMSET_01, $01
+	db BATTLEANIMOAMSET_03, $04
+	db BATTLEANIMOAMSET_01, $01
+	db BATTLEANIMOAMSET_03, $04
+	db BATTLEANIMOAMSET_01, $01
+	db -4
+
+.Frameset_3e 
+	db BATTLEANIMOAMSET_4B, $02
+	db BATTLEANIMOAMSET_4C, $02
+	db BATTLEANIMOAMSET_4D, $04
+	db BATTLEANIMOAMSET_4E, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $02
+	db -4
+
+.Frameset_3f 
+	db BATTLEANIMOAMSET_4B, $42
+	db BATTLEANIMOAMSET_4C, $42
+	db BATTLEANIMOAMSET_4D, $44
+	db BATTLEANIMOAMSET_4E, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $42
+	db -4
+
+.Frameset_40 
+	db BATTLEANIMOAMSET_4B, $c2
+	db BATTLEANIMOAMSET_4C, $c2
+	db BATTLEANIMOAMSET_4D, $c4
+	db BATTLEANIMOAMSET_4E, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_4E, $c2
+	db -4
+
+.Frameset_41 
+	db BATTLEANIMOAMSET_4B, $01
+	db BATTLEANIMOAMSET_4C, $01
+	db BATTLEANIMOAMSET_4D, $01
+	db BATTLEANIMOAMSET_4F, $01
+	db BATTLEANIMOAMSET_50, $01
+	db BATTLEANIMOAMSET_51, $01
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -4
+
+.Frameset_42 
+	db BATTLEANIMOAMSET_4B, $41
+	db BATTLEANIMOAMSET_4C, $41
+	db BATTLEANIMOAMSET_4D, $41
+	db BATTLEANIMOAMSET_4F, $41
+	db BATTLEANIMOAMSET_50, $41
+	db BATTLEANIMOAMSET_51, $41
+	db BATTLEANIMOAMSET_52, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $42
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $42
+	db -4
+
+.Frameset_08 
+	db BATTLEANIMOAMSET_00, $03
+	db BATTLEANIMOAMSET_07, $03
+	db BATTLEANIMOAMSET_08, $03
+	db BATTLEANIMOAMSET_09, $03
+	db -4
+
+.Frameset_09 
+	db BATTLEANIMOAMSET_0A, $07
+	db BATTLEANIMOAMSET_0B, $07
+	db BATTLEANIMOAMSET_0A, $07
+	db BATTLEANIMOAMSET_0B, $47
+	db -2
+
+.Frameset_0a 
+	db BATTLEANIMOAMSET_0C, $08
+	db -1
+
+.Frameset_0b 
+	db BATTLEANIMOAMSET_0D, $08
+	db -1
+
+.Frameset_0c 
+	db BATTLEANIMOAMSET_0A, $08
+	db -1
+
+.Frameset_0d 
+	db BATTLEANIMOAMSET_0A, $07
+	db BATTLEANIMOAMSET_0B, $07
+	db BATTLEANIMOAMSET_0A, $07
+	db BATTLEANIMOAMSET_0B, $47
+	db BATTLEANIMOAMSET_0A, $07
+	db -1
+
+.Frameset_0e 
+	db BATTLEANIMOAMSET_0A, $08
+	db -1
+
+.Frameset_0f 
+	db BATTLEANIMOAMSET_0A, $04
+	db BATTLEANIMOAMSET_0E, $04
+	db -2
+
+.Frameset_10 
+	db BATTLEANIMOAMSET_0F, $04
+	db BATTLEANIMOAMSET_10, $04
+	db -2
+
+.Frameset_11 
+	db BATTLEANIMOAMSET_10, $04
+	db BATTLEANIMOAMSET_0F, $04
+	db BATTLEANIMOAMSET_0E, $04
+	db BATTLEANIMOAMSET_0A, $04
+	db BATTLEANIMOAMSET_0E, $04
+	db BATTLEANIMOAMSET_0A, $04
+	db BATTLEANIMOAMSET_0E, $04
+	db BATTLEANIMOAMSET_0A, $04
+	db -4
+
+.Frameset_12 
+	db BATTLEANIMOAMSET_10, $01
+	db BATTLEANIMOAMSET_0F, $01
+	db BATTLEANIMOAMSET_12, $01
+	db BATTLEANIMOAMSET_11, $01
+	db BATTLEANIMOAMSET_12, $01
+	db BATTLEANIMOAMSET_0F, $01
+	db -2
+
+.Frameset_13 
+	db BATTLEANIMOAMSET_10, $03
+	db BATTLEANIMOAMSET_0F, $03
+	db BATTLEANIMOAMSET_12, $01
+	db -3, $01
+	db BATTLEANIMOAMSET_12, $01
+	db -3, $01
+	db BATTLEANIMOAMSET_12, $01
+	db -3, $01
+	db BATTLEANIMOAMSET_12, $01
+	db -3, $01
+	db BATTLEANIMOAMSET_12, $03
+	db -4
+
+.Frameset_14 
+	db BATTLEANIMOAMSET_13, $14
+	db -4
+
+.Frameset_15 
+	db BATTLEANIMOAMSET_10, $01
+	db BATTLEANIMOAMSET_0F, $01
+	db -2
+
+.Frameset_16 
+	db BATTLEANIMOAMSET_14, $08
+	db -1
+
+.Frameset_17 
+	db BATTLEANIMOAMSET_17, $04
+	db BATTLEANIMOAMSET_16, $08
+	db BATTLEANIMOAMSET_15, $08
+	db BATTLEANIMOAMSET_16, $08
+	db BATTLEANIMOAMSET_17, $04
+	db BATTLEANIMOAMSET_17, $04
+	db BATTLEANIMOAMSET_16, $48
+	db BATTLEANIMOAMSET_15, $48
+	db BATTLEANIMOAMSET_16, $48
+	db BATTLEANIMOAMSET_17, $04
+	db -2
+
+.Frameset_56 
+	db BATTLEANIMOAMSET_69, $08
+	db -1
+
+.Frameset_57 
+	db BATTLEANIMOAMSET_69, $20
+	db BATTLEANIMOAMSET_6A, $04
+	db BATTLEANIMOAMSET_6B, $04
+	db BATTLEANIMOAMSET_6D, $04
+	db BATTLEANIMOAMSET_6C, $04
+	db -1
+
+.Frameset_58 
+	db BATTLEANIMOAMSET_6C, $08
+	db BATTLEANIMOAMSET_6D, $08
+	db -2
+
+.Frameset_18 
+	db BATTLEANIMOAMSET_18, $04
+	db BATTLEANIMOAMSET_19, $04
+	db BATTLEANIMOAMSET_1A, $04
+	db -4
+
+.Frameset_19 
+	db BATTLEANIMOAMSET_1B, $08
+	db -1
+
+.Frameset_1a 
+	db BATTLEANIMOAMSET_0F, $08
+	db -1
+
+.Frameset_1b 
+	db BATTLEANIMOAMSET_1C, $08
+	db -1
+
+.Frameset_1c 
+	db BATTLEANIMOAMSET_0A, $08
+	db -4
+
+.Frameset_1d 
+	db BATTLEANIMOAMSET_1D, $08
+	db -1
+
+.Frameset_1e 
+	db BATTLEANIMOAMSET_17, $08
+	db -1
+
+.Frameset_1f 
+	db BATTLEANIMOAMSET_0F, $03
+	db BATTLEANIMOAMSET_10, $03
+	db BATTLEANIMOAMSET_1E, $03
+	db -1
+
+.Frameset_20 
+	db BATTLEANIMOAMSET_1F, $10
+	db BATTLEANIMOAMSET_20, $03
+	db -4
+
+.Frameset_21 
+	db BATTLEANIMOAMSET_20, $08
+	db -1
+
+.Frameset_22 
+	db BATTLEANIMOAMSET_20, $08
+	db BATTLEANIMOAMSET_21, $08
+	db BATTLEANIMOAMSET_1B, $08
+	db BATTLEANIMOAMSET_21, $08
+	db -2
+
+.Frameset_23 
+	db BATTLEANIMOAMSET_22, $08
+	db -1
+
+.Frameset_24 
+	db BATTLEANIMOAMSET_1B, $08
+	db -1
+
+.Frameset_25 
+	db BATTLEANIMOAMSET_23, $08
+	db -1
+
+.Frameset_26 
+	db BATTLEANIMOAMSET_24, $08
+	db -1
+
+.Frameset_27 
+	db BATTLEANIMOAMSET_25, $08
+	db -1
+
+.Frameset_28 
+	db BATTLEANIMOAMSET_26, $08
+	db BATTLEANIMOAMSET_27, $08
+	db -1
+
+.Frameset_29 
+	db BATTLEANIMOAMSET_28, $08
+	db BATTLEANIMOAMSET_29, $08
+	db -4
+
+.Frameset_2a 
+	db BATTLEANIMOAMSET_2A, $01
+	db BATTLEANIMOAMSET_2B, $01
+	db BATTLEANIMOAMSET_2C, $01
+	db BATTLEANIMOAMSET_2D, $01
+	db BATTLEANIMOAMSET_2E, $01
+	db BATTLEANIMOAMSET_2D, $01
+	db BATTLEANIMOAMSET_2C, $01
+	db BATTLEANIMOAMSET_2B, $01
+	db BATTLEANIMOAMSET_2A, $01
+	db -4
+
+.Frameset_2b 
+	db BATTLEANIMOAMSET_14, $01
+	db BATTLEANIMOAMSET_15, $01
+	db -2
+
+.Frameset_2c 
+	db BATTLEANIMOAMSET_2F, $04
+	db BATTLEANIMOAMSET_30, $28
+	db -4
+
+.Frameset_2d 
+	db BATTLEANIMOAMSET_31, $08
+	db -1
+
+.Frameset_2e 
+	db BATTLEANIMOAMSET_32, $20
+	db BATTLEANIMOAMSET_33, $20
+	db BATTLEANIMOAMSET_34, $20
+	db BATTLEANIMOAMSET_35, $20 ; fallthrough
+.Frameset_2f 
+	db -3, $02
+	db BATTLEANIMOAMSET_35, $04
+	db -3, $02
+	db BATTLEANIMOAMSET_35, $04
+	db -3, $02
+	db BATTLEANIMOAMSET_35, $04
+	db -3, $02
+	db BATTLEANIMOAMSET_35, $04
+	db -4
+
+.Frameset_30 
+	db BATTLEANIMOAMSET_14, $04
+	db BATTLEANIMOAMSET_15, $04
+	db -2
+
+.Frameset_31 
+	db BATTLEANIMOAMSET_36, $02
+	db BATTLEANIMOAMSET_37, $02
+	db BATTLEANIMOAMSET_38, $02
+	db BATTLEANIMOAMSET_39, $20
+	db -4
+
+.Frameset_32 
+	db BATTLEANIMOAMSET_3A, $02
+	db BATTLEANIMOAMSET_3B, $02
+	db BATTLEANIMOAMSET_3C, $02
+	db BATTLEANIMOAMSET_3D, $20
+	db -4
+
+.Frameset_33 
+	db BATTLEANIMOAMSET_3A, $42
+	db BATTLEANIMOAMSET_3B, $42
+	db BATTLEANIMOAMSET_3C, $42
+	db BATTLEANIMOAMSET_3D, $60
+	db -4
+
+.Frameset_34 
+	db BATTLEANIMOAMSET_3E, $08
+	db BATTLEANIMOAMSET_3F, $08
+	db BATTLEANIMOAMSET_40, $08
+	db -1
+
+.Frameset_35 
+	db BATTLEANIMOAMSET_40, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_40, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_41, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_41, $02
+	db -3, $02
+	db -2
+
+.Frameset_36 
+	db BATTLEANIMOAMSET_42, $02
+	db BATTLEANIMOAMSET_43, $02
+	db BATTLEANIMOAMSET_44, $02
+	db BATTLEANIMOAMSET_45, $02
+	db -2
+
+.Frameset_37 
+	db BATTLEANIMOAMSET_19, $02
+	db -3, $02
+	db -2
+
+.Frameset_38 
+	db BATTLEANIMOAMSET_46, $04
+	db BATTLEANIMOAMSET_47, $04
+	db -2
+
+.Frameset_39 
+	db BATTLEANIMOAMSET_18, $02
+	db -3, $02
+	db -2
+
+.Frameset_3a 
+	db BATTLEANIMOAMSET_48, $08
+	db -1
+
+.Frameset_3b 
+	db BATTLEANIMOAMSET_48, $48
+	db -1
+
+.Frameset_3c 
+	db BATTLEANIMOAMSET_49, $08
+	db -1
+
+.Frameset_3d 
+	db BATTLEANIMOAMSET_4A, $08
+	db -1
+
+.Frameset_43 
+	db BATTLEANIMOAMSET_20, $10
+	db BATTLEANIMOAMSET_1F, $10
+	db BATTLEANIMOAMSET_1E, $10
+	db -1
+
+.Frameset_4c 
+	db BATTLEANIMOAMSET_20, $08
+	db BATTLEANIMOAMSET_1F, $08
+	db BATTLEANIMOAMSET_1E, $08
+	db -1
+
+.Frameset_44 
+	db -3, $14
+	db BATTLEANIMOAMSET_55, $28
+	db BATTLEANIMOAMSET_54, $28
+	db BATTLEANIMOAMSET_53, $14
+	db -3, $04
+	db BATTLEANIMOAMSET_53, $04
+	db -3, $04
+	db BATTLEANIMOAMSET_53, $04
+	db -3, $04
+	db BATTLEANIMOAMSET_53, $04
+	db -4
+
+.Frameset_7e 
+	db BATTLEANIMOAMSET_1E, $08
+	db BATTLEANIMOAMSET_1F, $08
+	db BATTLEANIMOAMSET_20, $08
+	db -4
+
+.Frameset_45 
+	db -3, $00
+	db BATTLEANIMOAMSET_14, $00
+	db BATTLEANIMOAMSET_15, $00
+	db BATTLEANIMOAMSET_14, $40
+	db -3, $00
+	db BATTLEANIMOAMSET_16, $40
+	db BATTLEANIMOAMSET_15, $00
+	db BATTLEANIMOAMSET_16, $00
+	db -2
+
+.Frameset_46 
+	db BATTLEANIMOAMSET_56, $02
+	db BATTLEANIMOAMSET_57, $04
+	db -4
+
+.Frameset_47 
+	db BATTLEANIMOAMSET_56, $c2
+	db BATTLEANIMOAMSET_57, $c4
+	db -4
+
+.Frameset_48 
+	db BATTLEANIMOAMSET_56, $01
+	db BATTLEANIMOAMSET_57, $01
+	db BATTLEANIMOAMSET_58, $01
+	db BATTLEANIMOAMSET_57, $c1
+	db BATTLEANIMOAMSET_58, $c1
+	db BATTLEANIMOAMSET_57, $02
+	db -4
+
+.Frameset_49 
+	db BATTLEANIMOAMSET_56, $c1
+	db BATTLEANIMOAMSET_57, $c1
+	db BATTLEANIMOAMSET_58, $c1
+	db BATTLEANIMOAMSET_57, $01
+	db BATTLEANIMOAMSET_58, $01
+	db BATTLEANIMOAMSET_57, $c2
+	db -4
+
+.Frameset_4a 
+	db BATTLEANIMOAMSET_57, $c1
+	db BATTLEANIMOAMSET_58, $c1
+	db BATTLEANIMOAMSET_57, $01
+	db BATTLEANIMOAMSET_58, $01
+	db -2
+
+.Frameset_4b 
+	db BATTLEANIMOAMSET_59, $01
+	db BATTLEANIMOAMSET_5A, $01
+	db BATTLEANIMOAMSET_5B, $01
+	db BATTLEANIMOAMSET_5C, $02
+	db -4
+
+.Frameset_4d 
+	db BATTLEANIMOAMSET_0A, $0a
+	db BATTLEANIMOAMSET_0B, $43
+	db BATTLEANIMOAMSET_5D, $43
+	db BATTLEANIMOAMSET_0B, $c3
+	db BATTLEANIMOAMSET_0A, $82
+	db BATTLEANIMOAMSET_0B, $81
+	db BATTLEANIMOAMSET_5D, $01
+	db BATTLEANIMOAMSET_0B, $01
+	db -2
+
+.Frameset_4e 
+	db BATTLEANIMOAMSET_0A, $03
+	db BATTLEANIMOAMSET_0B, $47
+	db BATTLEANIMOAMSET_0A, $07
+	db BATTLEANIMOAMSET_0B, $07
+	db BATTLEANIMOAMSET_0A, $03
+	db -2
+
+.Frameset_4f 
+	db BATTLEANIMOAMSET_5E, $20
+	db BATTLEANIMOAMSET_5E, $20
+	db -4
+
+.Frameset_50 
+	db BATTLEANIMOAMSET_5F, $20
+	db BATTLEANIMOAMSET_5F, $20
+	db -4
+
+.Frameset_51 
+	db BATTLEANIMOAMSET_60, $08
+	db -1
+
+.Frameset_52 
+	db BATTLEANIMOAMSET_61, $01
+	db BATTLEANIMOAMSET_62, $01
+	db BATTLEANIMOAMSET_63, $01
+	db -1
+
+.Frameset_53 
+	db BATTLEANIMOAMSET_63, $07
+	db BATTLEANIMOAMSET_64, $07
+	db -2
+
+.Frameset_54 
+	db BATTLEANIMOAMSET_65, $01
+	db BATTLEANIMOAMSET_66, $01
+	db BATTLEANIMOAMSET_67, $01
+	db -1
+
+.Frameset_55 
+	db BATTLEANIMOAMSET_67, $07
+	db BATTLEANIMOAMSET_68, $07
+	db -2
+
+.Frameset_59 
+	db BATTLEANIMOAMSET_6E, $08
+	db -1
+
+.Frameset_5a 
+	db BATTLEANIMOAMSET_6F, $08
+	db -1
+
+.Frameset_5b 
+	db BATTLEANIMOAMSET_6E, $88
+	db -1
+
+.Frameset_5c 
+	db BATTLEANIMOAMSET_18, $04
+	db BATTLEANIMOAMSET_70, $04
+	db BATTLEANIMOAMSET_71, $04
+	db BATTLEANIMOAMSET_72, $04
+	db BATTLEANIMOAMSET_73, $04
+	db -4
+
+.Frameset_5d 
+	db BATTLEANIMOAMSET_74, $04
+	db BATTLEANIMOAMSET_75, $04
+	db -2
+
+.Frameset_5e 
+	db BATTLEANIMOAMSET_14, $08
+	db -1
+
+.Frameset_7a 
+	db BATTLEANIMOAMSET_74, $03
+	db BATTLEANIMOAMSET_14, $03
+	db BATTLEANIMOAMSET_15, $03
+	db BATTLEANIMOAMSET_14, $03
+	db BATTLEANIMOAMSET_15, $03
+	db -4
+
+.Frameset_af 
+	db BATTLEANIMOAMSET_14, $00
+	db BATTLEANIMOAMSET_15, $00
+	db BATTLEANIMOAMSET_14, $00
+	db BATTLEANIMOAMSET_15, $00
+	db BATTLEANIMOAMSET_74, $0c
+	db -4
+
+.Frameset_5f 
+	db BATTLEANIMOAMSET_76, $08
+	db -1
+
+.Frameset_60 
+	db BATTLEANIMOAMSET_77, $01
+	db BATTLEANIMOAMSET_78, $01
+	db BATTLEANIMOAMSET_79, $01
+	db BATTLEANIMOAMSET_7A, $01
+	db BATTLEANIMOAMSET_7B, $01
+	db BATTLEANIMOAMSET_7C, $01
+	db BATTLEANIMOAMSET_7D, $01
+	db BATTLEANIMOAMSET_7C, $c1
+	db BATTLEANIMOAMSET_7B, $c1
+	db BATTLEANIMOAMSET_7A, $c1
+	db BATTLEANIMOAMSET_79, $c1
+	db BATTLEANIMOAMSET_78, $c1
+	db BATTLEANIMOAMSET_77, $c1
+	db -4
+
+.Frameset_61 
+	db BATTLEANIMOAMSET_1B, $04
+	db BATTLEANIMOAMSET_7E, $04
+	db -2
+
+.Frameset_62 
+	db BATTLEANIMOAMSET_1B, $44
+	db BATTLEANIMOAMSET_7E, $44
+	db -2
+
+.Frameset_63 
+	db BATTLEANIMOAMSET_7F, $08
+	db -1
+
+.Frameset_64 
+	db BATTLEANIMOAMSET_25, $08
+	db -1
+
+.Frameset_65 
+	db BATTLEANIMOAMSET_80, $08
+	db -1
+
+.Frameset_66 
+	db BATTLEANIMOAMSET_83, $07
+	db BATTLEANIMOAMSET_82, $07
+	db BATTLEANIMOAMSET_81, $07
+	db BATTLEANIMOAMSET_82, $07
+	db BATTLEANIMOAMSET_83, $07
+	db BATTLEANIMOAMSET_82, $07
+	db BATTLEANIMOAMSET_81, $07
+	db -4
+
+.Frameset_67 
+	db BATTLEANIMOAMSET_1B, $10
+	db -4
+
+.Frameset_68 
+	db -3, $0f
+	db BATTLEANIMOAMSET_84, $0f
+	db BATTLEANIMOAMSET_85, $0f
+	db BATTLEANIMOAMSET_29, $0f
+	db BATTLEANIMOAMSET_28, $0f
+	db BATTLEANIMOAMSET_86, $20
+	db -4
+
+.Frameset_69 
+	db BATTLEANIMOAMSET_1B, $03
+	db BATTLEANIMOAMSET_87, $03
+	db BATTLEANIMOAMSET_88, $03
+	db BATTLEANIMOAMSET_89, $03
+	db -4
+
+.Frameset_6a 
+	db BATTLEANIMOAMSET_8A, $02
+	db BATTLEANIMOAMSET_8B, $02
+	db BATTLEANIMOAMSET_8C, $02
+	db BATTLEANIMOAMSET_8D, $02
+	db -4
+
+.Frameset_6b 
+	db BATTLEANIMOAMSET_61, $02
+	db BATTLEANIMOAMSET_62, $02
+	db BATTLEANIMOAMSET_63, $02
+	db -1
+
+.Frameset_6c 
+	db BATTLEANIMOAMSET_65, $02
+	db BATTLEANIMOAMSET_66, $02
+	db BATTLEANIMOAMSET_67, $02
+	db -1
+
+.Frameset_6d 
+	db BATTLEANIMOAMSET_8E, $08
+	db -1
+
+.Frameset_6e 
+	db BATTLEANIMOAMSET_8E, $48
+	db -1
+
+.Frameset_6f 
+	db BATTLEANIMOAMSET_8F, $10
+	db BATTLEANIMOAMSET_90, $10
+	db -2
+
+.Frameset_70 
+	db BATTLEANIMOAMSET_91, $10
+	db BATTLEANIMOAMSET_92, $10
+	db -2
+
+.Frameset_71 
+	db BATTLEANIMOAMSET_93, $08
+	db -1
+
+.Frameset_72 
+	db BATTLEANIMOAMSET_1E, $08
+	db -1
+
+.Frameset_73 
+	db BATTLEANIMOAMSET_1B, $07
+	db BATTLEANIMOAMSET_94, $07
+	db -2
+
+.Frameset_74 
+	db BATTLEANIMOAMSET_95, $08
+	db -1
+
+.Frameset_75 
+	db BATTLEANIMOAMSET_96, $08
+	db -1
+
+.Frameset_76 
+	db BATTLEANIMOAMSET_95, $08
+	db -1
+
+.Frameset_77 
+	db BATTLEANIMOAMSET_97, $01
+	db BATTLEANIMOAMSET_97, $41
+	db -2
+
+.Frameset_78 
+	db BATTLEANIMOAMSET_98, $08
+	db -1
+
+.Frameset_79 
+	db BATTLEANIMOAMSET_99, $20
+	db BATTLEANIMOAMSET_99, $20
+	db BATTLEANIMOAMSET_99, $20
+	db BATTLEANIMOAMSET_99, $20
+	db BATTLEANIMOAMSET_99, $20
+	db BATTLEANIMOAMSET_9A, $08
+	db -1
+
+.Frameset_7b 
+	db BATTLEANIMOAMSET_9B, $08
+	db -1
+
+.Frameset_7c 
+	db BATTLEANIMOAMSET_9C, $02
+	db BATTLEANIMOAMSET_9D, $02
+	db BATTLEANIMOAMSET_9E, $08
+	db -3, $02
+	db BATTLEANIMOAMSET_9E, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_9E, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_9E, $02
+	db -4
+
+.Frameset_7d 
+	db BATTLEANIMOAMSET_9F, $08
+	db -1
+
+.Frameset_7f 
+	db BATTLEANIMOAMSET_0F, $08
+	db -1
+
+.Frameset_80 
+	db BATTLEANIMOAMSET_6B, $18
+	db -4
+
+.Frameset_81 
+	db BATTLEANIMOAMSET_A0, $01 ; fallthrough
+.Frameset_82 
+	db BATTLEANIMOAMSET_A1, $01 ; fallthrough
+.Frameset_83 
+	db BATTLEANIMOAMSET_A2, $01
+	db -4
+
+.Frameset_84 
+	db BATTLEANIMOAMSET_A3, $08
+	db -1
+
+.Frameset_85 
+	db BATTLEANIMOAMSET_A4, $04
+	db BATTLEANIMOAMSET_A5, $04
+	db BATTLEANIMOAMSET_A6, $04
+	db BATTLEANIMOAMSET_A7, $04
+	db BATTLEANIMOAMSET_A6, $44
+	db BATTLEANIMOAMSET_A5, $44
+	db -2
+
+.Frameset_86 
+	db BATTLEANIMOAMSET_A8, $04
+	db BATTLEANIMOAMSET_A9, $04
+	db BATTLEANIMOAMSET_AA, $04
+	db BATTLEANIMOAMSET_AB, $04
+	db BATTLEANIMOAMSET_AA, $44
+	db BATTLEANIMOAMSET_A9, $44
+	db -2
+
+.Frameset_87 
+	db BATTLEANIMOAMSET_1B, $08
+	db -1
+
+.Frameset_88 
+	db BATTLEANIMOAMSET_AC, $08
+	db -1
+
+.Frameset_89 
+	db BATTLEANIMOAMSET_AD, $08
+	db -1
+
+.Frameset_8a 
+	db BATTLEANIMOAMSET_AE, $08
+	db -1
+
+.Frameset_8b 
+	db BATTLEANIMOAMSET_AF, $08
+	db -1
+
+.Frameset_8c 
+	db BATTLEANIMOAMSET_B0, $20
+	db -4
+
+.Frameset_8d 
+	db BATTLEANIMOAMSET_B1, $07
+	db BATTLEANIMOAMSET_B1, $47
+	db -2
+
+.Frameset_8e 
+	db BATTLEANIMOAMSET_B2, $08
+	db -1
+
+.Frameset_8f 
+	db BATTLEANIMOAMSET_B3, $08
+	db -1
+
+.Frameset_90 
+	db BATTLEANIMOAMSET_B3, $48
+	db -1
+
+.Frameset_91 
+	db BATTLEANIMOAMSET_B3, $88
+	db -1
+
+.Frameset_92 
+	db BATTLEANIMOAMSET_B3, $c8
+	db -1
+
+.Frameset_93 
+	db BATTLEANIMOAMSET_B5, $08
+	db -1
+
+.Frameset_94 
+	db BATTLEANIMOAMSET_B5, $48
+	db -1
+
+.Frameset_95 
+	db BATTLEANIMOAMSET_B5, $88
+	db -1
+
+.Frameset_96 
+	db BATTLEANIMOAMSET_B5, $c8
+	db -1
+
+.Frameset_97 
+	db BATTLEANIMOAMSET_B4, $08
+	db -1
+
+.Frameset_98 
+	db BATTLEANIMOAMSET_6B, $08
+	db -1
+
+.Frameset_99 
+	db BATTLEANIMOAMSET_B6, $08
+	db -1
+
+.Frameset_9a 
+	db BATTLEANIMOAMSET_B7, $20
+	db -1
+
+.Frameset_9b 
+	db BATTLEANIMOAMSET_1B, $20
+	db -1
+
+.Frameset_9c 
+	db BATTLEANIMOAMSET_B8, $20
+	db -1
+
+.Frameset_9d 
+	db BATTLEANIMOAMSET_B8, $60
+	db -1
+
+.Frameset_9e 
+	db BATTLEANIMOAMSET_B9, $20
+	db -1
+
+.Frameset_9f 
+	db BATTLEANIMOAMSET_BA, $20
+	db -1
+
+.Frameset_a0 
+	db BATTLEANIMOAMSET_BB, $60
+	db -1
+
+.Frameset_a1 
+	db BATTLEANIMOAMSET_BB, $20
+	db -1
+
+.Frameset_a2 
+	db BATTLEANIMOAMSET_BC, $20
+	db -1
+
+.Frameset_a3 
+	db BATTLEANIMOAMSET_BD, $0b
+	db BATTLEANIMOAMSET_BE, $0b
+	db BATTLEANIMOAMSET_1B, $0b
+	db -4
+
+.Frameset_a4 
+	db BATTLEANIMOAMSET_BF, $04
+	db BATTLEANIMOAMSET_C0, $04
+	db BATTLEANIMOAMSET_C1, $04
+	db -4
+
+.Frameset_a5 
+	db BATTLEANIMOAMSET_C2, $20
+	db BATTLEANIMOAMSET_C2, $20
+	db -4
+
+.Frameset_a6 
+	db BATTLEANIMOAMSET_4B, $02
+	db BATTLEANIMOAMSET_4C, $02
+	db BATTLEANIMOAMSET_4D, $20
+	db BATTLEANIMOAMSET_4D, $20
+	db BATTLEANIMOAMSET_4D, $20
+	db BATTLEANIMOAMSET_4F, $01
+	db BATTLEANIMOAMSET_50, $01
+	db BATTLEANIMOAMSET_51, $01
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $02
+	db -4
+
+.Frameset_a7 
+	db BATTLEANIMOAMSET_4B, $c2
+	db BATTLEANIMOAMSET_4C, $c2
+	db BATTLEANIMOAMSET_4D, $e0
+	db BATTLEANIMOAMSET_4D, $e0
+	db BATTLEANIMOAMSET_4D, $e0
+	db BATTLEANIMOAMSET_4F, $c1
+	db BATTLEANIMOAMSET_50, $c1
+	db BATTLEANIMOAMSET_51, $c1
+	db BATTLEANIMOAMSET_52, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $c2
+	db -3, $02
+	db BATTLEANIMOAMSET_52, $c2
+	db -4
+
+.Frameset_a8 
+	db BATTLEANIMOAMSET_C3, $01
+	db BATTLEANIMOAMSET_C3, $c1
+	db -2
+
+.Frameset_a9 
+	db BATTLEANIMOAMSET_C4, $20
+	db -1
+
+.Frameset_aa 
+	db BATTLEANIMOAMSET_C5, $04
+	db BATTLEANIMOAMSET_C6, $04
+	db BATTLEANIMOAMSET_C7, $04
+	db -4
+
+.Frameset_ab 
+	db BATTLEANIMOAMSET_C8, $01
+	db BATTLEANIMOAMSET_C8, $41
+	db -2
+
+.Frameset_ac 
+	db BATTLEANIMOAMSET_C9, $03
+	db BATTLEANIMOAMSET_05, $03
+	db -4
+
+.Frameset_ad 
+	db BATTLEANIMOAMSET_CA, $20
+	db BATTLEANIMOAMSET_CB, $03
+	db BATTLEANIMOAMSET_CA, $03
+	db BATTLEANIMOAMSET_CB, $03
+	db -2
+
+.Frameset_ae 
+	db BATTLEANIMOAMSET_03, $a0
+	db -1
+
+.Frameset_b0 
+	db BATTLEANIMOAMSET_CC, $20
+	db -1
+
+.Frameset_b1 
+	db BATTLEANIMOAMSET_7F, $02
+	db BATTLEANIMOAMSET_25, $02
+	db BATTLEANIMOAMSET_80, $02
+	db BATTLEANIMOAMSET_25, $02
+	db -2
+
+.Frameset_b2 
+	db BATTLEANIMOAMSET_CD, $04
+	db BATTLEANIMOAMSET_CE, $04
+	db BATTLEANIMOAMSET_CD, $c4
+	db BATTLEANIMOAMSET_CE, $c4
+	db -2
+
+.Frameset_b3 
+	db BATTLEANIMOAMSET_CF, $04
+	db BATTLEANIMOAMSET_D0, $04
+	db BATTLEANIMOAMSET_D1, $04
+	db BATTLEANIMOAMSET_D2, $04
+	db -4
+
+.Frameset_b4 
+	db BATTLEANIMOAMSET_D3, $20
+	db -1
+
+.Frameset_b5 
+	db BATTLEANIMOAMSET_D4, $08
+	db -1
+
+.Frameset_b6 
+	db BATTLEANIMOAMSET_D5, $08
+	db -1
+
+.Frameset_b7 
+	db BATTLEANIMOAMSET_D6, $08
+	db -1
+
+.Frameset_b8 
+	db BATTLEANIMOAMSET_D7, $08
+	db -1
+
+; ceeae
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -12,7 +12,7 @@
 	jp [hl]
 ; ccfce
 
-.Jumptable: ; ccfce (33:4fce)
+.Jumptable
 	dw BattleAnimFunction_00 ; 00
 	dw BattleAnimFunction_01 ; 01
 	dw BattleAnimFunction_02 ; 02
@@ -100,10 +100,10 @@
 	dw .zero
 	dw .one
 
-.one: ; cd075 (33:5075)
+.one
 	call DeinitBattleAnimation
 
-.zero: ; cd078 (33:5078)
+.zero
 	ret
 
 BattleAnimFunction_06: ; cd079 (33:5079)
@@ -183,7 +183,7 @@
 	dw .zero
 	dw .one
 
-.zero: ; cd0ea (33:50ea)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -201,7 +201,7 @@
 	and $7f
 	ld [hl], a
 
-.one: ; cd106 (33:5106)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -231,11 +231,11 @@
 	dw .zero
 	dw .one
 
-.one: ; cd131 (33:5131)
+.one
 	call DeinitBattleAnimation
 	ret
 
-.zero: ; cd135 (33:5135)
+.zero
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -279,12 +279,12 @@
 	dw .ten
 	dw .eleven
 
-.zero: ; cd177 (33:5177)
+.zero
 	call GetBallAnimFunction
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.one: ; cd17e (33:517e)
+.one
 	call BattleAnimFunction_05
 	ret c
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -299,7 +299,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.three: ; cd196 (33:5196)
+.three
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, $9
 	call ReinitBattleAnimFrameset
@@ -309,7 +309,7 @@
 	inc hl
 	ld [hl], $10
 
-.four: ; cd1a7 (33:51a7)
+.four
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hli]
@@ -337,7 +337,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.six: ; cd1d2 (33:51d2)
+.six
 	ld a, $d
 	call ReinitBattleAnimFrameset
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
@@ -348,7 +348,7 @@
 .nine
 	ret
 
-.seven: ; cd1dd (33:51dd)
+.seven
 	call GetBallAnimFunction
 	ld a, $a
 	call ReinitBattleAnimFrameset
@@ -378,7 +378,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.eleven: ; cd20e (33:520e)
+.eleven
 	call DeinitBattleAnimation
 	ret
 
@@ -389,12 +389,12 @@
 	dw .one
 	dw .two
 
-.zero: ; cd21b (33:521b)
+.zero
 	call GetBallAnimFunction
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.one: ; cd222 (33:5222)
+.one
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -405,7 +405,7 @@
 
 .next
 	call BattleAnim_IncAnonJumptableIndex
-.two: ; cd232 (33:5232)
+.two
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -450,7 +450,7 @@
 	ret
 ; cd26c (33:526c)
 
-.balls: ; cd26c
+.balls
 	db MASTER_BALL, 5
 	db ULTRA_BALL,  3
 	db GREAT_BALL,  6
@@ -474,7 +474,7 @@
 	dw .three
 	dw .four
 
-.zero: ; cd291 (33:5291)
+.zero
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -485,7 +485,7 @@
 	ld [hl], a
 	ret
 
-.one: ; cd2a0 (33:52a0)
+.one
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -497,15 +497,15 @@
 	call Functionce70a
 	ret
 
-.two: ; cd2b1 (33:52b1)
+.two
 	call DeinitBattleAnimation
 	ret
 
-.three: ; cd2b5 (33:52b5)
+.three
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, $f
 	call ReinitBattleAnimFrameset
-.four: ; cd2bd (33:52bd)
+.four
 	ret
 
 BattleAnimFunction_07: ; cd2be (33:52be)
@@ -514,7 +514,7 @@
 	dw .zero
 	dw .one
 
-.zero: ; cd2c5 (33:52c5)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -521,7 +521,7 @@
 	ld [hl], $30
 	inc hl
 	ld [hl], $48
-.one: ; cd2d1 (33:52d1)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hli]
@@ -564,7 +564,7 @@
 	dw .two
 	dw .three
 
-.zero: ; cd311 (33:5311)
+.zero
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -575,12 +575,12 @@
 
 .next
 	call BattleAnim_IncAnonJumptableIndex
-.one: ; cd321 (33:5321)
+.one
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $0
-.two: ; cd32a (33:532a)
+.two
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -634,7 +634,7 @@
 .finish
 	call BattleAnim_IncAnonJumptableIndex
 
-.three: ; cd37d (33:537d)
+.three
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -647,7 +647,7 @@
 	call .SetCoords
 	ret
 
-.SetCoords: ; cd38e (33:538e)
+.SetCoords
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -677,7 +677,7 @@
 	dw .one
 	dw .two
 
-.zero: ; cd3b7 (33:53b7)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -690,7 +690,7 @@
 	add hl, bc
 	ld [hl], a
 
-.one: ; cd3cc (33:53cc)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -716,7 +716,7 @@
 	ld [hl], a
 	ret
 
-.two: ; cd3ee (33:53ee)
+.two
 	call DeinitBattleAnimation
 	ret
 
@@ -734,7 +734,7 @@
 	dw .eight
 	dw .nine
 
-.zero: ; cd409 (33:5409)
+.zero
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -747,7 +747,7 @@
 	call ReinitBattleAnimFrameset
 	ret
 
-.seven: ; cd41d (33:541d)
+.seven
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -764,7 +764,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, $10
 	call ReinitBattleAnimFrameset
-.eight: ; cd437 (33:5437)
+.eight
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -786,38 +786,38 @@
 	inc [hl]
 	ret
 
-.nine: ; cd458 (33:5458)
+.nine
 	call DeinitBattleAnimation
 	ret
 
-.one: ; cd45c (33:545c)
+.one
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	dec [hl]
 	ret
 
-.four: ; cd462 (33:5462)
+.four
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	inc [hl]
 
-.two: ; cd467 (33:5467)
+.two
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	dec [hl]
 	ret
 
-.five: ; cd46d (33:546d)
+.five
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	inc [hl]
 
-.three: ; cd472 (33:5472)
+.three
 	ld hl, BATTLEANIMSTRUCT_XOFFSET
 	add hl, bc
 	inc [hl]
 
-.six: ; cd477 (33:5477)
+.six
 	ret
 
 BattleAnimFunction_0B: ; cd478 (33:5478)
@@ -833,13 +833,13 @@
 	dw .seven
 	dw .eight
 
-.zero: ; cd48d (33:548d)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $40
 
-.one: ; cd496 (33:5496)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -895,7 +895,7 @@
 	ld [hl], e
 	ret
 
-.two: ; cd4ee (33:54ee)
+.two
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -946,7 +946,7 @@
 	ld [hl], e
 	ret
 
-.three: ; cd53a (33:553a)
+.three
 	ld a, $16
 	call ReinitBattleAnimFrameset
 	ld hl, BATTLEANIMSTRUCT_01
@@ -960,7 +960,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.eight: ; cd549 (33:5549)
+.eight
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1014,7 +1014,7 @@
 	dw .zero
 	dw .one
 
-.zero: ; cd591 (33:5591)
+.zero
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -1029,7 +1029,7 @@
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $40
-.one: ; cd5aa (33:55aa)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1078,12 +1078,12 @@
 	dw .one
 	dw .two
 
-.zero: ; cd5f2 (33:55f2)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $c
-.one: ; cd5fb (33:55fb)
+.one
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1104,7 +1104,7 @@
 	ld a, $22
 	call ReinitBattleAnimFrameset
 
-.two: ; cd61b (33:561b)
+.two
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1166,7 +1166,7 @@
 	dw .three
 	dw .four
 
-.zero: ; cd677 (33:5677)
+.zero
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, $42
 	ld [hLCDStatCustom], a
@@ -1176,7 +1176,7 @@
 	ld [hLCDStatCustom + 2], a
 	ret
 
-.one: ; cd687 (33:5687)
+.one
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld e, [hl]
@@ -1217,10 +1217,10 @@
 	add hl, bc
 	inc [hl]
 	inc [hl]
-.two: ; cd6c5 (33:56c5)
+.two
 	ret
 
-.three: ; cd6c6 (33:56c6)
+.three
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1231,7 +1231,7 @@
 	ld [hLCDStatCustom + 1], a
 	ld [hLCDStatCustom + 2], a
 
-.four: ; cd6d6 (33:56d6)
+.four
 	call DeinitBattleAnimation
 	ret
 
@@ -4201,7 +4201,7 @@
 	inc a
 	ret
 
-.ApplySineWave: ; ce749 (33:6749)
+.ApplySineWave
 	ld e, a
 	ld a, d
 	ld d, 0
--- a/battle/objects/oam.asm
+++ b/battle/objects/oam.asm
@@ -1,1087 +1,1086 @@
-
-BattleAnimOAMData: ; ceeae
-; vtile offset (?), length, address
-	dbbw $00, $10, Unknown_cf2f6 ; 00
-	dbbw $04, $09, Unknown_cf262 ; 01
-	dbbw $08, $04, Unknown_cf22e ; 02
-	dbbw $09, $04, Unknown_cf21e ; 03
-	dbbw $0d, $04, Unknown_cf386 ; 04
-	dbbw $0f, $04, Unknown_cf21e ; 05
-	dbbw $13, $04, Unknown_cf386 ; 06
-	dbbw $04, $10, Unknown_cf2f6 ; 07
-	dbbw $08, $10, Unknown_cf2f6 ; 08
-	dbbw $08, $10, Unknown_cf336 ; 09
-	dbbw $00, $04, Unknown_cf386 ; 0a
-	dbbw $02, $04, Unknown_cf21e ; 0b
-	dbbw $06, $02, Unknown_cf376 ; 0c
-	dbbw $07, $02, Unknown_cf376 ; 0d
-	dbbw $02, $04, Unknown_cf386 ; 0e
-	dbbw $04, $01, Unknown_cf736 ; 0f
-	dbbw $05, $01, Unknown_cf736 ; 10
-	dbbw $00, $02, Unknown_cf20e ; 11
-	dbbw $02, $02, Unknown_cf20e ; 12
-	dbbw $00, $04, Unknown_cf3a6 ; 13
-	dbbw $00, $01, Unknown_cf736 ; 14
-	dbbw $01, $01, Unknown_cf736 ; 15
-	dbbw $02, $01, Unknown_cf736 ; 16
-	dbbw $03, $01, Unknown_cf736 ; 17
-	dbbw $00, $04, Unknown_cf22e ; 18
-	dbbw $01, $10, Unknown_cf2f6 ; 19
-	dbbw $05, $10, Unknown_cf2f6 ; 1a
-	dbbw $00, $04, Unknown_cf21e ; 1b
-	dbbw $05, $0c, Unknown_cf2b6 ; 1c
-	dbbw $02, $04, Unknown_cf22e ; 1d
-	dbbw $06, $01, Unknown_cf736 ; 1e
-	dbbw $07, $01, Unknown_cf736 ; 1f
-	dbbw $08, $01, Unknown_cf736 ; 20
-	dbbw $04, $04, Unknown_cf21e ; 21
-	dbbw $09, $16, Unknown_cf3b6 ; 22
-	dbbw $04, $02, Unknown_cf20e ; 23
-	dbbw $06, $02, Unknown_cf20e ; 24
-	dbbw $0c, $01, Unknown_cf736 ; 25
-	dbbw $0a, $01, Unknown_cf736 ; 26
-	dbbw $0b, $04, Unknown_cf22e ; 27
-	dbbw $08, $04, Unknown_cf386 ; 28
-	dbbw $06, $04, Unknown_cf386 ; 29
-	dbbw $00, $05, Unknown_cf40e ; 2a
-	dbbw $03, $06, Unknown_cf422 ; 2b
-	dbbw $00, $07, Unknown_cf43a ; 2c
-	dbbw $03, $08, Unknown_cf456 ; 2d
-	dbbw $00, $09, Unknown_cf476 ; 2e
-	dbbw $00, $04, Unknown_cf49a ; 2f
-	dbbw $02, $04, Unknown_cf4aa ; 30
-	dbbw $04, $06, Unknown_cf4ba ; 31
-	dbbw $00, $02, Unknown_cf4da ; 32
-	dbbw $00, $07, Unknown_cf512 ; 33
-	dbbw $00, $0e, Unknown_cf4da ; 34
-	dbbw $00, $15, Unknown_cf512 ; 35
-	dbbw $00, $02, Unknown_cf566 ; 36
-	dbbw $00, $06, Unknown_cf566 ; 37
-	dbbw $00, $0a, Unknown_cf566 ; 38
-	dbbw $00, $0e, Unknown_cf566 ; 39
-	dbbw $00, $02, Unknown_cf59e ; 3a
-	dbbw $00, $06, Unknown_cf59e ; 3b
-	dbbw $00, $0a, Unknown_cf59e ; 3c
-	dbbw $00, $0e, Unknown_cf59e ; 3d
-	dbbw $00, $04, Unknown_cf5d6 ; 3e
-	dbbw $00, $10, Unknown_cf5d6 ; 3f
-	dbbw $00, $1a, Unknown_cf5d6 ; 40
-	dbbw $00, $1a, Unknown_cf63e ; 41
-	dbbw $0e, $04, Unknown_cf6a6 ; 42
-	dbbw $0e, $08, Unknown_cf6a6 ; 43
-	dbbw $0e, $04, Unknown_cf6c6 ; 44
-	dbbw $0e, $08, Unknown_cf6c6 ; 45
-	dbbw $0e, $04, Unknown_cf6e6 ; 46
-	dbbw $0e, $04, Unknown_cf6f6 ; 47
-	dbbw $00, $06, Unknown_cf706 ; 48
-	dbbw $03, $04, Unknown_cf71e ; 49
-	dbbw $03, $02, Unknown_cf72e ; 4a
-	dbbw $01, $05, Unknown_cf736 ; 4b
-	dbbw $01, $06, Unknown_cf74a ; 4c
-	dbbw $01, $07, Unknown_cf762 ; 4d
-	dbbw $01, $03, Unknown_cf762 ; 4e
-	dbbw $01, $08, Unknown_cf77e ; 4f
-	dbbw $01, $09, Unknown_cf79e ; 50
-	dbbw $01, $0a, Unknown_cf7c2 ; 51
-	dbbw $01, $06, Unknown_cf7c2 ; 52
-	dbbw $00, $09, Unknown_cf262 ; 53
-	dbbw $04, $04, Unknown_cf22e ; 54
-	dbbw $05, $04, Unknown_cf22e ; 55
-	dbbw $00, $02, Unknown_cf216 ; 56
-	dbbw $02, $02, Unknown_cf216 ; 57
-	dbbw $04, $02, Unknown_cf216 ; 58
-	dbbw $02, $04, Unknown_cf7ea ; 59
-	dbbw $02, $04, Unknown_cf7fa ; 5a
-	dbbw $02, $02, Unknown_cf376 ; 5b
-	dbbw $04, $02, Unknown_cf376 ; 5c
-	dbbw $06, $04, Unknown_cf396 ; 5d
-	dbbw $08, $02, Unknown_cf376 ; 5e
-	dbbw $09, $02, Unknown_cf376 ; 5f
-	dbbw $05, $02, Unknown_cf80a ; 60
-	dbbw $00, $02, Unknown_cf812 ; 61
-	dbbw $00, $05, Unknown_cf812 ; 62
-	dbbw $00, $09, Unknown_cf812 ; 63
-	dbbw $09, $09, Unknown_cf812 ; 64
-	dbbw $00, $04, Unknown_cf836 ; 65
-	dbbw $00, $07, Unknown_cf836 ; 66
-	dbbw $00, $09, Unknown_cf836 ; 67
-	dbbw $09, $09, Unknown_cf836 ; 68
-	dbbw $04, $01, Unknown_cf80e ; 69
-	dbbw $05, $02, Unknown_cf37e ; 6a
-	dbbw $06, $04, Unknown_cf21e ; 6b
-	dbbw $0a, $04, Unknown_cf21e ; 6c
-	dbbw $0e, $04, Unknown_cf21e ; 6d
-	dbbw $08, $05, Unknown_cf8f6 ; 6e
-	dbbw $0d, $03, Unknown_cf90a ; 6f
-	dbbw $01, $08, Unknown_cfa06 ; 70
-	dbbw $03, $08, Unknown_cfa06 ; 71
-	dbbw $05, $08, Unknown_cfa06 ; 72
-	dbbw $07, $08, Unknown_cfa06 ; 73
-	dbbw $06, $04, Unknown_cf22e ; 74
-	dbbw $07, $04, Unknown_cf22e ; 75
-	dbbw $0a, $02, Unknown_cf4d2 ; 76
-	dbbw $00, $01, Unknown_cf916 ; 77
-	dbbw $00, $03, Unknown_cf91a ; 78
-	dbbw $00, $06, Unknown_cf926 ; 79
-	dbbw $00, $09, Unknown_cf93e ; 7a
-	dbbw $00, $0c, Unknown_cf962 ; 7b
-	dbbw $00, $0e, Unknown_cf992 ; 7c
-	dbbw $00, $0f, Unknown_cf9ca ; 7d
-	dbbw $04, $04, Unknown_cf21e ; 7e
-	dbbw $08, $04, Unknown_cf21e ; 7f
-	dbbw $0d, $01, Unknown_cf736 ; 80
-	dbbw $0e, $04, Unknown_cfa26 ; 81
-	dbbw $10, $01, Unknown_cf736 ; 82
-	dbbw $11, $01, Unknown_cf736 ; 83
-	dbbw $04, $02, Unknown_cf37e ; 84
-	dbbw $05, $02, Unknown_cf37e ; 85
-	dbbw $0a, $04, Unknown_cf386 ; 86
-	dbbw $00, $08, Unknown_cfa36 ; 87
-	dbbw $00, $0c, Unknown_cfa76 ; 88
-	dbbw $00, $10, Unknown_cfa36 ; 89
-	dbbw $09, $02, Unknown_cfaa6 ; 8a
-	dbbw $09, $04, Unknown_cfaa6 ; 8b
-	dbbw $09, $06, Unknown_cfaa6 ; 8c
-	dbbw $09, $08, Unknown_cfaa6 ; 8d
-	dbbw $12, $05, Unknown_cfac6 ; 8e
-	dbbw $00, $04, Unknown_cfada ; 8f
-	dbbw $04, $04, Unknown_cfada ; 90
-	dbbw $08, $04, Unknown_cfada ; 91
-	dbbw $0c, $04, Unknown_cfada ; 92
-	dbbw $00, $06, Unknown_cfaea ; 93
-	dbbw $04, $04, Unknown_cf21e ; 94
-	dbbw $0a, $04, Unknown_cf386 ; 95
-	dbbw $15, $04, Unknown_cf4aa ; 96
-	dbbw $04, $04, Unknown_cf4aa ; 97
-	dbbw $0c, $04, Unknown_cf386 ; 98
-	dbbw $0a, $04, Unknown_cfb02 ; 99
-	dbbw $0c, $04, Unknown_cf21e ; 9a
-	dbbw $00, $24, Unknown_cfb12 ; 9b
-	dbbw $0d, $02, Unknown_cfba2 ; 9c
-	dbbw $0d, $04, Unknown_cfba2 ; 9d
-	dbbw $0d, $06, Unknown_cfba2 ; 9e
-	dbbw $02, $08, Unknown_cfbba ; 9f
-	dbbw $08, $07, Unknown_cfbda ; a0
-	dbbw $08, $05, Unknown_cfbda ; a1
-	dbbw $08, $03, Unknown_cfbda ; a2
-	dbbw $00, $10, Unknown_cf2b6 ; a3
-	dbbw $00, $09, Unknown_cfbf6 ; a4
-	dbbw $06, $09, Unknown_cfbf6 ; a5
-	dbbw $0c, $09, Unknown_cfbf6 ; a6
-	dbbw $12, $09, Unknown_cfbf6 ; a7
-	dbbw $18, $09, Unknown_cfbf6 ; a8
-	dbbw $1e, $09, Unknown_cfbf6 ; a9
-	dbbw $24, $09, Unknown_cfbf6 ; aa
-	dbbw $2a, $09, Unknown_cfbf6 ; ab
-	dbbw $03, $04, Unknown_cfc1a ; ac
-	dbbw $12, $04, Unknown_cf21e ; ad
-	dbbw $10, $04, Unknown_cf386 ; ae
-	dbbw $16, $01, Unknown_cf736 ; af
-	dbbw $17, $04, Unknown_cf22e ; b0
-	dbbw $18, $04, Unknown_cf21e ; b1
-	dbbw $1c, $04, Unknown_cf21e ; b2
-	dbbw $20, $03, Unknown_cf21e ; b3
-	dbbw $23, $04, Unknown_cf386 ; b4
-	dbbw $25, $03, Unknown_cf21e ; b5
-	dbbw $17, $04, Unknown_cf21e ; b6
-	dbbw $0a, $10, Unknown_cf2f6 ; b7
-	dbbw $10, $10, Unknown_cf2b6 ; b8
-	dbbw $00, $10, Unknown_cf2b6 ; b9
-	dbbw $04, $04, Unknown_cf21e ; ba
-	dbbw $08, $02, Unknown_cf20e ; bb
-	dbbw $20, $06, Unknown_cfc2a ; bc
-	dbbw $08, $01, Unknown_cf736 ; bd
-	dbbw $04, $04, Unknown_cf21e ; be
-	dbbw $1a, $04, Unknown_cf4aa ; bf
-	dbbw $16, $09, Unknown_cf262 ; c0
-	dbbw $10, $10, Unknown_cfc42 ; c1
-	dbbw $09, $06, Unknown_cfc82 ; c2
-	dbbw $11, $09, Unknown_cf23e ; c3
-	dbbw $0e, $04, Unknown_cf21e ; c4
-	dbbw $0b, $04, Unknown_cf4aa ; c5
-	dbbw $1c, $06, Unknown_cf22e ; c6
-	dbbw $20, $10, Unknown_cfc42 ; c7
-	dbbw $05, $06, Unknown_cfc9a ; c8
-	dbbw $0b, $04, Unknown_cf21e ; c9
-	dbbw $09, $04, Unknown_cfcb2 ; ca
-	dbbw $0b, $04, Unknown_cf386 ; cb
-	dbbw $11, $0d, Unknown_cfcc2 ; cc
-	dbbw $00, $09, Unknown_cf23e ; cd
-	dbbw $09, $09, Unknown_cf23e ; ce
-	dbbw $00, $0c, Unknown_cf286 ; cf
-	dbbw $06, $0c, Unknown_cf286 ; d0
-	dbbw $0c, $0c, Unknown_cf286 ; d1
-	dbbw $12, $0c, Unknown_cf286 ; d2
-	dbbw $00, $0d, Unknown_cfcc2 ; d3
-	dbbw $00, $07, Unknown_cf85a ; d4
-	dbbw $00, $06, Unknown_cf8ae ; d5
-	dbbw $00, $0e, Unknown_cf876 ; d6
-	dbbw $00, $0c, Unknown_cf8c6 ; d7
-; cf20e
-
-Unknown_cf20e:
-	dsprite  -1, 0,  -1, 4, $00, $00
-	dsprite   0, 0,  -1, 4, $01, $00
-
-Unknown_cf216:
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $01, $00
-
-Unknown_cf21e:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $02, $00
-	dsprite   0, 0,   0, 0, $03, $00
-
-Unknown_cf22e:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $00, $60
-
-Unknown_cf23e:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 4, $04, $00
-	dsprite  -1, 4,   0, 4, $05, $00
-	dsprite   0, 4,  -2, 4, $06, $00
-	dsprite   0, 4,  -1, 4, $07, $00
-	dsprite   0, 4,   0, 4, $08, $00
-
-Unknown_cf262:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $00, $20
-	dsprite  -1, 4,  -2, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $03, $00
-	dsprite  -1, 4,   0, 4, $02, $60
-	dsprite   0, 4,  -2, 4, $00, $40
-	dsprite   0, 4,  -1, 4, $01, $60
-	dsprite   0, 4,   0, 4, $00, $60
-
-Unknown_cf286:
-	dsprite  -2, 0,  -2, 4, $00, $00
-	dsprite  -2, 0,  -1, 4, $01, $00
-	dsprite  -2, 0,   0, 4, $02, $00
-	dsprite  -1, 0,  -2, 4, $03, $00
-	dsprite  -1, 0,  -1, 4, $04, $00
-	dsprite  -1, 0,   0, 4, $05, $00
-	dsprite   0, 0,  -2, 4, $05, $60
-	dsprite   0, 0,  -1, 4, $04, $60
-	dsprite   0, 0,   0, 4, $03, $60
-	dsprite   1, 0,  -2, 4, $02, $60
-	dsprite   1, 0,  -1, 4, $01, $60
-	dsprite   1, 0,   0, 4, $00, $60
-
-Unknown_cf2b6:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $02, $00
-	dsprite  -2, 0,   1, 0, $03, $00
-	dsprite  -1, 0,  -2, 0, $04, $00
-	dsprite  -1, 0,  -1, 0, $05, $00
-	dsprite  -1, 0,   0, 0, $06, $00
-	dsprite  -1, 0,   1, 0, $07, $00
-	dsprite   0, 0,  -2, 0, $08, $00
-	dsprite   0, 0,  -1, 0, $09, $00
-	dsprite   0, 0,   0, 0, $0a, $00
-	dsprite   0, 0,   1, 0, $0b, $00
-	dsprite   1, 0,  -2, 0, $0c, $00
-	dsprite   1, 0,  -1, 0, $0d, $00
-	dsprite   1, 0,   0, 0, $0e, $00
-	dsprite   1, 0,   1, 0, $0f, $00
-
-Unknown_cf2f6:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,  -2, 0, $02, $00
-	dsprite  -1, 0,  -1, 0, $03, $00
-	dsprite  -2, 0,   0, 0, $01, $20
-	dsprite  -2, 0,   1, 0, $00, $20
-	dsprite  -1, 0,   0, 0, $03, $20
-	dsprite  -1, 0,   1, 0, $02, $20
-	dsprite   0, 0,  -2, 0, $02, $40
-	dsprite   0, 0,  -1, 0, $03, $40
-	dsprite   1, 0,  -2, 0, $00, $40
-	dsprite   1, 0,  -1, 0, $01, $40
-	dsprite   0, 0,   0, 0, $03, $60
-	dsprite   0, 0,   1, 0, $02, $60
-	dsprite   1, 0,   0, 0, $01, $60
-	dsprite   1, 0,   1, 0, $00, $60
-
-Unknown_cf336:
-	dsprite  -3, 4,  -3, 4, $00, $00
-	dsprite  -3, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -3, 4, $02, $00
-	dsprite  -2, 4,  -2, 4, $03, $00
-	dsprite  -3, 4,   0, 4, $01, $20
-	dsprite  -3, 4,   1, 4, $00, $20
-	dsprite  -2, 4,   0, 4, $03, $20
-	dsprite  -2, 4,   1, 4, $02, $20
-	dsprite   0, 4,  -3, 4, $02, $40
-	dsprite   0, 4,  -2, 4, $03, $40
-	dsprite   1, 4,  -3, 4, $00, $40
-	dsprite   1, 4,  -2, 4, $01, $40
-	dsprite   0, 4,   0, 4, $03, $60
-	dsprite   0, 4,   1, 4, $02, $60
-	dsprite   1, 4,   0, 4, $01, $60
-	dsprite   1, 4,   1, 4, $00, $60
-
-Unknown_cf376:
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $00, $20
-
-Unknown_cf37e:
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $00, $20
-
-Unknown_cf386:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $01, $20
-
-Unknown_cf396:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $01, $40
-
-Unknown_cf3a6:
-	dsprite  -1, 2,  -1, 0, $02, $00
-	dsprite   0, 2,  -1, 0, $03, $00
-	dsprite  -2, 6,   0, 0, $02, $00
-	dsprite  -1, 6,   0, 0, $03, $00
-
-Unknown_cf3b6:
-	dsprite   1, 0, -11, 0, $01, $00
-	dsprite   0, 0, -10, 0, $02, $00
-	dsprite   0, 0,  -9, 0, $03, $00
-	dsprite   0, 0,  -8, 0, $00, $00
-	dsprite   0, 0,  -7, 0, $03, $00
-	dsprite   0, 0,  -6, 0, $00, $00
-	dsprite   0, 0,  -5, 0, $03, $00
-	dsprite   0, 0,  -4, 0, $00, $00
-	dsprite   0, 0,  -3, 0, $03, $00
-	dsprite   0, 0,  -2, 0, $00, $00
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $02, $00
-	dsprite  -1, 0,   1, 0, $03, $00
-	dsprite  -1, 0,   2, 0, $00, $00
-	dsprite  -1, 0,   3, 0, $03, $00
-	dsprite  -1, 0,   4, 0, $00, $00
-	dsprite  -1, 0,   5, 0, $03, $00
-	dsprite  -1, 0,   6, 0, $00, $00
-	dsprite  -1, 0,   7, 0, $03, $00
-	dsprite  -1, 0,   8, 0, $00, $00
-	dsprite  -1, 0,   9, 0, $01, $00
-	dsprite  -2, 0,  10, 0, $02, $00
-
-Unknown_cf40e:
-	dsprite  -3, 4,  -1, 0, $00, $00
-	dsprite  -3, 4,   0, 0, $00, $20
-	dsprite  -2, 4,  -1, 0, $01, $00
-	dsprite  -2, 4,   0, 0, $01, $20
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-Unknown_cf422:
-	dsprite  -4, 4,  -1, 0, $00, $00
-	dsprite  -4, 4,   0, 0, $00, $20
-	dsprite  -3, 4,  -1, 0, $01, $00
-	dsprite  -3, 4,   0, 0, $01, $20
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-Unknown_cf43a:
-	dsprite  -5, 4,  -1, 0, $00, $00
-	dsprite  -5, 4,   0, 0, $00, $20
-	dsprite  -4, 4,  -1, 0, $01, $00
-	dsprite  -4, 4,   0, 0, $01, $20
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-Unknown_cf456:
-	dsprite  -6, 4,  -1, 0, $00, $00
-	dsprite  -6, 4,   0, 0, $00, $20
-	dsprite  -5, 4,  -1, 0, $01, $00
-	dsprite  -5, 4,   0, 0, $01, $20
-	dsprite  -4, 4,  -1, 4, $02, $00
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-Unknown_cf476:
-	dsprite  -7, 4,  -1, 0, $00, $00
-	dsprite  -7, 4,   0, 0, $00, $20
-	dsprite  -6, 4,  -1, 0, $01, $00
-	dsprite  -6, 4,   0, 0, $01, $20
-	dsprite  -5, 4,  -1, 4, $02, $00
-	dsprite  -4, 4,  -1, 4, $02, $00
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite  -2, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-
-Unknown_cf49a:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $00, $20
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $00, $60
-
-Unknown_cf4aa:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $01, $60
-	dsprite   0, 0,   0, 0, $00, $60
-
-Unknown_cf4ba:
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $03, $00
-	dsprite   0, 4,  -1, 0, $04, $00
-	dsprite   0, 4,   0, 0, $05, $00
-
-Unknown_cf4d2:
-	dsprite  -1, 5,  -1, 0, $00, $00
-	dsprite  -1, 1,   0, 0, $00, $00
-
-Unknown_cf4da:
-	dsprite  -1, 0,  -2, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $00, $00
-	dsprite  -3, 0,  -2, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $00, $00
-	dsprite  -2, 0,  -3, 4, $00, $00
-	dsprite  -2, 0,  -2, 4, $01, $00
-	dsprite  -2, 0,  -1, 4, $00, $00
-	dsprite  -2, 0,   0, 4, $01, $00
-	dsprite  -2, 0,   1, 4, $00, $00
-	dsprite  -1, 0,  -4, 4, $00, $00
-	dsprite  -1, 0,  -3, 4, $01, $00
-	dsprite  -1, 0,  -1, 4, $01, $00
-	dsprite  -1, 0,   1, 4, $01, $00
-	dsprite  -1, 0,   2, 4, $00, $00
-
-Unknown_cf512:
-	dsprite  -2, 0,  -2, 4, $00, $00
-	dsprite  -2, 0,   0, 4, $00, $00
-	dsprite  -1, 0,  -3, 4, $00, $00
-	dsprite  -1, 0,  -2, 4, $01, $00
-	dsprite  -1, 0,  -1, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $01, $00
-	dsprite  -1, 0,   1, 4, $00, $00
-	dsprite  -4, 0,  -2, 4, $00, $00
-	dsprite  -4, 0,   0, 4, $00, $00
-	dsprite  -3, 0,  -3, 4, $00, $00
-	dsprite  -3, 0,  -2, 4, $01, $00
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $01, $00
-	dsprite  -3, 0,   1, 4, $00, $00
-	dsprite  -2, 0,  -4, 4, $00, $00
-	dsprite  -2, 0,  -3, 4, $01, $00
-	dsprite  -2, 0,  -1, 4, $01, $00
-	dsprite  -2, 0,   1, 4, $01, $00
-	dsprite  -2, 0,   2, 4, $00, $00
-	dsprite  -1, 0,  -4, 4, $01, $00
-	dsprite  -1, 0,   2, 4, $01, $00
-
-Unknown_cf566:
-	dsprite  -7, 4,  -1, 0, $00, $00
-	dsprite  -7, 4,   0, 0, $01, $00
-	dsprite  -6, 4,  -1, 0, $02, $00
-	dsprite  -6, 4,   0, 0, $03, $00
-	dsprite  -5, 4,  -1, 0, $04, $00
-	dsprite  -5, 4,   0, 0, $05, $00
-	dsprite  -4, 4,  -1, 0, $06, $00
-	dsprite  -4, 4,   0, 0, $07, $00
-	dsprite  -3, 4,  -1, 0, $08, $00
-	dsprite  -3, 4,   0, 0, $09, $00
-	dsprite  -2, 4,  -1, 0, $0a, $00
-	dsprite  -2, 4,   0, 0, $0b, $00
-	dsprite  -1, 4,  -1, 0, $0c, $00
-	dsprite  -1, 4,   0, 0, $0d, $00
-
-Unknown_cf59e:
-	dsprite  -7, 4,  -1, 0, $0c, $00
-	dsprite  -7, 4,   0, 0, $0d, $00
-	dsprite  -6, 4,  -1, 0, $08, $00
-	dsprite  -6, 4,   0, 0, $09, $00
-	dsprite  -5, 4,  -1, 0, $04, $00
-	dsprite  -5, 4,   0, 0, $05, $00
-	dsprite  -4, 4,  -1, 0, $00, $00
-	dsprite  -4, 4,   0, 0, $01, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $03, $00
-	dsprite  -2, 4,   0, 0, $02, $00
-	dsprite  -2, 4,   1, 0, $03, $00
-	dsprite  -1, 4,   0, 0, $0a, $00
-	dsprite  -1, 4,   1, 0, $0b, $00
-
-Unknown_cf5d6:
-	dsprite   1, 4,  -2, 0, $00, $40
-	dsprite   1, 4,  -1, 0, $02, $40
-	dsprite   1, 4,   0, 0, $02, $60
-	dsprite   1, 4,   1, 0, $00, $60
-	dsprite  -1, 4,  -3, 0, $09, $20
-	dsprite  -1, 4,  -2, 0, $08, $20
-	dsprite  -1, 4,  -1, 0, $06, $00
-	dsprite  -1, 4,   0, 0, $07, $00
-	dsprite  -1, 4,   1, 0, $08, $00
-	dsprite  -1, 4,   2, 0, $09, $00
-	dsprite   0, 4,  -3, 0, $01, $20
-	dsprite   0, 4,  -2, 0, $00, $20
-	dsprite   0, 4,  -1, 0, $0c, $00
-	dsprite   0, 4,   0, 0, $0d, $00
-	dsprite   0, 4,   1, 0, $00, $00
-	dsprite   0, 4,   2, 0, $01, $00
-	dsprite  -3, 4,  -2, 0, $00, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $02, $20
-	dsprite  -3, 4,   1, 0, $00, $20
-	dsprite  -2, 4,  -3, 0, $03, $20
-	dsprite  -2, 4,  -2, 0, $02, $20
-	dsprite  -2, 4,  -1, 0, $04, $00
-	dsprite  -2, 4,   0, 0, $05, $00
-	dsprite  -2, 4,   1, 0, $02, $00
-	dsprite  -2, 4,   2, 0, $03, $00
-
-Unknown_cf63e:
-	dsprite  -3, 4,  -2, 0, $00, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $02, $20
-	dsprite  -3, 4,   1, 0, $00, $20
-	dsprite  -2, 4,  -3, 4, $00, $00
-	dsprite  -2, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -1, 0, $05, $20
-	dsprite  -2, 4,   0, 0, $04, $20
-	dsprite  -2, 4,   0, 4, $01, $20
-	dsprite  -2, 4,   1, 4, $00, $20
-	dsprite  -1, 4,  -3, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 0, $07, $20
-	dsprite  -1, 4,   0, 0, $06, $20
-	dsprite  -1, 4,   0, 4, $03, $20
-	dsprite  -1, 4,   1, 4, $02, $20
-	dsprite   0, 4,  -3, 4, $04, $00
-	dsprite   0, 4,  -2, 4, $05, $00
-	dsprite   0, 4,  -1, 0, $0d, $20
-	dsprite   0, 4,   0, 0, $0c, $20
-	dsprite   0, 4,   0, 4, $05, $20
-	dsprite   0, 4,   1, 4, $04, $20
-	dsprite   1, 4,  -2, 0, $00, $40
-	dsprite   1, 4,  -1, 0, $02, $40
-	dsprite   1, 4,   0, 0, $02, $60
-	dsprite   1, 4,   1, 0, $00, $60
-
-Unknown_cf6a6:
-	dsprite  -3, 0,  -1, 4, $02, $00
-	dsprite   2, 0,  -1, 4, $02, $60
-	dsprite  -1, 4,  -3, 0, $01, $00
-	dsprite  -1, 4,   2, 0, $01, $60
-	dsprite  -4, 0,  -1, 4, $02, $00
-	dsprite   3, 0,  -1, 4, $02, $60
-	dsprite  -1, 4,  -4, 0, $01, $00
-	dsprite  -1, 4,   3, 0, $01, $60
-
-Unknown_cf6c6:
-	dsprite  -3, 5,  -3, 5, $00, $20
-	dsprite  -3, 5,   1, 3, $00, $00
-	dsprite   1, 3,  -3, 5, $00, $60
-	dsprite   1, 3,   1, 3, $00, $40
-	dsprite  -4, 5,  -4, 5, $00, $20
-	dsprite  -4, 5,   2, 3, $00, $00
-	dsprite   2, 3,  -4, 5, $00, $60
-	dsprite   2, 3,   2, 3, $00, $40
-
-Unknown_cf6e6:
-	dsprite  -3, 4,  -1, 4, $02, $00
-	dsprite   1, 4,  -1, 4, $02, $60
-	dsprite  -1, 4,  -3, 4, $01, $00
-	dsprite  -1, 4,   1, 4, $01, $60
-
-Unknown_cf6f6:
-	dsprite  -2, 0,  -2, 0, $00, $20
-	dsprite  -2, 0,   1, 0, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $60
-	dsprite   1, 0,   1, 0, $00, $40
-
-Unknown_cf706:
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -2, 0,  -1, 2, $00, $00
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   1, 0,  -1, 2, $00, $00
-	dsprite   2, 0,  -1, 4, $00, $00
-
-Unknown_cf71e:
-	dsprite  -1, 4,  -2, 0, $00, $20
-	dsprite  -1, 2,  -1, 0, $00, $20
-	dsprite  -1, 2,   0, 0, $00, $00
-	dsprite  -1, 4,   1, 0, $00, $00
-
-Unknown_cf72e:
-	dsprite  -1, 4,  -1, 0, $00, $60
-	dsprite  -1, 4,   0, 0, $00, $40
-
-Unknown_cf736:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,  -2, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $01, $20
-	dsprite   0, 4,  -2, 4, $01, $40
-	dsprite   0, 4,  -1, 4, $01, $60
-
-Unknown_cf74a:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   0, 2,  -3, 6, $01, $00
-	dsprite   0, 2,  -2, 6, $01, $20
-	dsprite   1, 2,  -3, 6, $01, $40
-	dsprite   1, 2,  -2, 6, $01, $60
-
-Unknown_cf762:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 0,  -3, 0, $01, $00
-	dsprite   1, 0,  -2, 0, $01, $20
-	dsprite   2, 0,  -3, 0, $01, $40
-	dsprite   2, 0,  -2, 0, $01, $60
-
-Unknown_cf77e:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   1, 6,  -4, 2, $01, $00
-	dsprite   1, 6,  -3, 2, $01, $20
-	dsprite   2, 6,  -4, 2, $01, $40
-	dsprite   2, 6,  -3, 2, $01, $60
-
-Unknown_cf79e:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   2, 4,  -4, 4, $00, $00
-	dsprite   2, 4,  -5, 4, $01, $00
-	dsprite   2, 4,  -4, 4, $01, $20
-	dsprite   3, 4,  -5, 4, $01, $40
-	dsprite   3, 4,  -4, 4, $01, $60
-
-Unknown_cf7c2:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 2,  -2, 6, $00, $00
-	dsprite   1, 0,  -2, 0, $00, $00
-	dsprite   1, 6,  -3, 2, $00, $00
-	dsprite   2, 4,  -4, 4, $00, $00
-	dsprite   3, 2,  -5, 6, $00, $00
-	dsprite   3, 2,  -6, 6, $01, $00
-	dsprite   3, 2,  -5, 6, $01, $20
-	dsprite   4, 2,  -6, 6, $01, $40
-	dsprite   4, 2,  -5, 6, $01, $60
-
-Unknown_cf7ea:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $00, $20
-
-Unknown_cf7fa:
-	dsprite  -1, 4,  -2, 0, $02, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $02, $20
-
-Unknown_cf80a:
-	dsprite  -1, 0,  -1, 4, $00, $00
-
-Unknown_cf80e:
-	dsprite   0, 0,  -1, 4, $00, $00
-
-Unknown_cf812:
-	dsprite  -1, 4,  -4, 4, $00, $00
-	dsprite  -1, 4,  -3, 4, $01, $00
-	dsprite  -1, 4,  -2, 4, $02, $00
-	dsprite  -1, 4,  -1, 4, $03, $00
-	dsprite  -1, 4,   0, 4, $04, $00
-	dsprite  -1, 4,   1, 4, $05, $00
-	dsprite  -1, 4,   2, 4, $06, $00
-	dsprite  -2, 4,   1, 4, $07, $00
-	dsprite  -2, 4,   2, 4, $08, $00
-
-Unknown_cf836:
-	dsprite  -2, 4,  -4, 4, $08, $20
-	dsprite  -2, 4,  -3, 4, $07, $20
-	dsprite  -1, 4,  -4, 4, $06, $20
-	dsprite  -1, 4,  -3, 4, $05, $20
-	dsprite  -1, 4,  -2, 4, $04, $20
-	dsprite  -1, 4,  -1, 4, $03, $20
-	dsprite  -1, 4,   0, 4, $02, $20
-	dsprite  -1, 4,   1, 4, $01, $20
-	dsprite  -1, 4,   2, 4, $00, $20
-
-Unknown_cf85a:
-	dsprite   0, 0,  -4, 4, $00, $10
-	dsprite   0, 0,  -3, 4, $01, $10
-	dsprite   0, 0,  -2, 4, $02, $10
-	dsprite   0, 0,  -1, 4, $03, $10
-	dsprite   0, 0,   0, 4, $04, $10
-	dsprite   0, 0,   1, 4, $05, $10
-	dsprite   0, 0,   2, 4, $06, $10
-
-Unknown_cf876:
-	dsprite  -1, 0,  -4, 4, $00, $10
-	dsprite   0, 0,  -4, 4, $01, $10
-	dsprite  -1, 0,  -3, 4, $02, $10
-	dsprite   0, 0,  -3, 4, $03, $10
-	dsprite  -1, 0,  -2, 4, $04, $10
-	dsprite   0, 0,  -2, 4, $05, $10
-	dsprite  -1, 0,  -1, 4, $06, $10
-	dsprite   0, 0,  -1, 4, $07, $10
-	dsprite  -1, 0,   0, 4, $08, $10
-	dsprite   0, 0,   0, 4, $09, $10
-	dsprite  -1, 0,   1, 4, $0a, $10
-	dsprite   0, 0,   1, 4, $0b, $10
-	dsprite  -1, 0,   2, 4, $0c, $10
-	dsprite   0, 0,   2, 4, $0d, $10
-
-Unknown_cf8ae:
-	dsprite   0, 0,  -3, 0, $00, $11
-	dsprite   0, 0,  -2, 0, $01, $11
-	dsprite   0, 0,  -1, 0, $02, $11
-	dsprite   0, 0,   0, 0, $03, $11
-	dsprite   0, 0,   1, 0, $04, $11
-	dsprite   0, 0,   2, 0, $05, $11
-
-Unknown_cf8c6:
-	dsprite   0, 0,  -3, 0, $00, $11
-	dsprite   1, 0,  -3, 0, $01, $11
-	dsprite   0, 0,  -2, 0, $02, $11
-	dsprite   1, 0,  -2, 0, $03, $11
-	dsprite   0, 0,  -1, 0, $04, $11
-	dsprite   1, 0,  -1, 0, $05, $11
-	dsprite   0, 0,   0, 0, $06, $11
-	dsprite   1, 0,   0, 0, $07, $11
-	dsprite   0, 0,   1, 0, $08, $11
-	dsprite   1, 0,   1, 0, $09, $11
-	dsprite   0, 0,   2, 0, $0a, $11
-	dsprite   1, 0,   2, 0, $0b, $11
-
-Unknown_cf8f6:
-	dsprite  -2, 4,   0, 4, $00, $00
-	dsprite  -1, 4,  -2, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-	dsprite  -1, 4,   0, 4, $03, $00
-	dsprite   0, 4,  -2, 4, $04, $00
-
-Unknown_cf90a:
-	dsprite  -1, 4,  -2, 4, $00, $00
-	dsprite  -1, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,   0, 4, $02, $00
-
-Unknown_cf916:
-	dsprite  -4, 4,   1, 4, $01, $60
-
-Unknown_cf91a:
-	dsprite  -4, 4,   1, 4, $00, $00
-	dsprite  -4, 4,   0, 4, $01, $60
-	dsprite  -3, 4,   1, 4, $01, $60
-
-Unknown_cf926:
-	dsprite  -4, 4,   1, 4, $01, $00
-	dsprite  -4, 4,   0, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $01, $60
-	dsprite  -3, 4,   1, 4, $00, $00
-	dsprite  -3, 4,   0, 4, $01, $60
-	dsprite  -2, 4,   1, 4, $01, $60
-
-Unknown_cf93e:
-	dsprite  -4, 4,  -2, 4, $01, $60
-	dsprite  -4, 4,  -1, 4, $00, $00
-	dsprite  -4, 4,   0, 4, $01, $00
-	dsprite  -3, 4,  -1, 4, $01, $60
-	dsprite  -3, 4,   0, 4, $00, $00
-	dsprite  -3, 4,   1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $01, $60
-	dsprite  -2, 4,   1, 4, $00, $00
-	dsprite  -1, 4,   1, 4, $01, $60
-
-Unknown_cf962:
-	dsprite  -4, 4,  -3, 4, $01, $60
-	dsprite  -4, 4,  -2, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $01, $00
-	dsprite  -3, 4,  -2, 4, $01, $60
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite  -3, 4,   0, 4, $01, $00
-	dsprite  -2, 4,  -1, 4, $01, $60
-	dsprite  -2, 4,   0, 4, $00, $00
-	dsprite  -2, 4,   1, 4, $01, $00
-	dsprite  -1, 4,   0, 4, $01, $60
-	dsprite  -1, 4,   1, 4, $00, $00
-	dsprite   0, 4,   1, 4, $01, $60
-
-Unknown_cf992:
-	dsprite  -4, 4,  -3, 4, $00, $00
-	dsprite  -4, 4,  -2, 4, $01, $00
-	dsprite  -3, 4,  -3, 4, $01, $60
-	dsprite  -3, 4,  -2, 4, $00, $00
-	dsprite  -3, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,  -2, 4, $01, $60
-	dsprite  -2, 4,  -1, 4, $00, $00
-	dsprite  -2, 4,   0, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $01, $60
-	dsprite  -1, 4,   0, 4, $00, $00
-	dsprite  -1, 4,   1, 4, $01, $00
-	dsprite   0, 4,   0, 4, $01, $60
-	dsprite   0, 4,   1, 4, $00, $00
-	dsprite   1, 4,   1, 4, $01, $60
-
-Unknown_cf9ca:
-	dsprite  -4, 4,  -3, 4, $01, $00
-	dsprite  -3, 4,  -3, 4, $00, $00
-	dsprite  -3, 4,  -2, 4, $01, $00
-	dsprite  -2, 4,  -3, 4, $01, $60
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,  -2, 4, $01, $60
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,   0, 4, $01, $00
-	dsprite   0, 4,  -1, 4, $01, $60
-	dsprite   0, 4,   0, 4, $00, $00
-	dsprite   0, 4,   1, 4, $01, $00
-	dsprite   1, 4,   0, 4, $01, $60
-	dsprite   1, 4,   1, 4, $00, $00
-	dsprite   2, 4,   1, 4, $01, $60
-
-Unknown_cfa06:
-	dsprite  -2, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $00, $20
-	dsprite  -1, 0,   0, 0, $01, $20
-	dsprite   0, 0,  -1, 0, $01, $40
-	dsprite   1, 0,  -1, 0, $00, $40
-	dsprite   0, 0,   0, 0, $01, $60
-	dsprite   1, 0,   0, 0, $00, $60
-
-Unknown_cfa26:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $01, $60
-	dsprite   0, 0,   0, 0, $00, $60
-
-Unknown_cfa36:
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $03, $00
-	dsprite  -1, 4,  -1, 0, $00, $00
-	dsprite  -1, 4,   0, 0, $01, $00
-	dsprite   0, 4,  -1, 0, $02, $00
-	dsprite   0, 4,   0, 0, $03, $00
-	dsprite  -3, 4,  -1, 0, $00, $00
-	dsprite  -3, 4,   0, 0, $01, $00
-	dsprite  -2, 4,  -1, 0, $02, $00
-	dsprite  -2, 4,   0, 0, $03, $00
-	dsprite   0, 4,  -1, 0, $00, $00
-	dsprite   0, 4,   0, 0, $01, $00
-	dsprite   1, 4,  -1, 0, $02, $00
-	dsprite   1, 4,   0, 0, $03, $00
-
-Unknown_cfa76:
-	dsprite  -2, 0,  -1, 0, $00, $00
-	dsprite  -2, 0,   0, 0, $01, $00
-	dsprite  -1, 0,  -1, 0, $02, $00
-	dsprite  -1, 0,   0, 0, $03, $00
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $00
-	dsprite   0, 0,  -1, 0, $02, $00
-	dsprite   0, 0,   0, 0, $03, $00
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $01, $00
-	dsprite   1, 0,  -1, 0, $02, $00
-	dsprite   1, 0,   0, 0, $03, $00
-
-Unknown_cfaa6:
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite  -1, 0,   0, 4, $00, $00
-	dsprite  -2, 4,   1, 4, $00, $00
-	dsprite  -2, 0,   2, 4, $00, $00
-	dsprite  -3, 4,   3, 4, $00, $00
-	dsprite  -3, 0,   4, 4, $00, $00
-	dsprite  -4, 0,   5, 4, $00, $00
-	dsprite  -5, 4,   6, 4, $00, $00
-
-Unknown_cfac6:
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -1, 4,  -1, 4, $02, $00
-	dsprite   0, 4,  -1, 4, $01, $40
-	dsprite   1, 4,  -1, 4, $00, $40
-
-Unknown_cfada:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $02, $00
-	dsprite  -1, 4,   1, 0, $03, $00
-
-Unknown_cfaea:
-	dsprite  -1, 0,  -2, 4, $00, $00
-	dsprite  -1, 0,  -1, 4, $01, $00
-	dsprite  -1, 0,   0, 4, $02, $00
-	dsprite   0, 0,  -2, 4, $03, $00
-	dsprite   0, 0,  -1, 4, $04, $00
-	dsprite   0, 0,   0, 4, $05, $00
-
-Unknown_cfb02:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $05, $00
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $05, $00
-
-Unknown_cfb12:
-	dsprite  -4, 4,   1, 0, $00, $00
-	dsprite  -4, 4,   2, 0, $01, $00
-	dsprite  -3, 4,  -1, 0, $02, $00
-	dsprite  -3, 4,   0, 0, $03, $00
-	dsprite  -3, 4,   1, 0, $04, $00
-	dsprite  -3, 4,   2, 0, $05, $00
-	dsprite  -3, 4,   3, 0, $06, $00
-	dsprite  -2, 4,  -2, 0, $07, $00
-	dsprite  -2, 4,  -1, 0, $08, $00
-	dsprite  -2, 4,   0, 0, $09, $00
-	dsprite  -2, 4,   1, 0, $0a, $00
-	dsprite  -2, 4,   2, 0, $0b, $00
-	dsprite  -2, 4,   3, 0, $0c, $00
-	dsprite  -2, 4,   4, 0, $0d, $00
-	dsprite  -1, 4,  -3, 0, $0e, $00
-	dsprite  -1, 4,  -2, 0, $0f, $00
-	dsprite  -1, 4,  -1, 0, $10, $00
-	dsprite  -1, 4,   0, 0, $11, $00
-	dsprite  -1, 4,   1, 0, $12, $00
-	dsprite  -1, 4,   2, 0, $13, $00
-	dsprite   0, 4,  -5, 0, $14, $00
-	dsprite   0, 4,  -4, 0, $15, $00
-	dsprite   0, 4,  -3, 0, $16, $00
-	dsprite   0, 4,  -2, 0, $17, $00
-	dsprite   0, 4,  -1, 0, $18, $00
-	dsprite   0, 4,   0, 0, $19, $00
-	dsprite   0, 4,   1, 0, $1a, $00
-	dsprite   0, 4,   2, 0, $1b, $00
-	dsprite   0, 4,   3, 0, $1c, $00
-	dsprite   1, 4,  -5, 0, $1d, $00
-	dsprite   1, 4,  -4, 0, $1e, $00
-	dsprite   1, 4,  -2, 0, $1f, $00
-	dsprite   1, 4,  -1, 0, $20, $00
-	dsprite   1, 4,   0, 0, $21, $00
-	dsprite   1, 4,   1, 0, $22, $00
-	dsprite   2, 4,   0, 0, $23, $00
-
-Unknown_cfba2:
-	dsprite   0, 4,  -1, 0, $02, $00
-	dsprite   0, 4,   0, 0, $03, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -2, 4,  -1, 0, $00, $00
-	dsprite  -2, 4,   0, 0, $00, $20
-
-Unknown_cfbba:
-	dsprite  -1, 0,  -2, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $02, $00
-	dsprite  -1, 0,   1, 0, $03, $00
-	dsprite   0, 0,  -2, 0, $04, $00
-	dsprite   0, 0,  -1, 0, $05, $00
-	dsprite   0, 0,   0, 0, $06, $00
-	dsprite   0, 0,   1, 0, $07, $00
-
-Unknown_cfbda:
-	dsprite  -2, 4,  -1, 4, $00, $00
-	dsprite  -1, 4,  -1, 4, $00, $00
-	dsprite   0, 4,  -1, 4, $00, $00
-	dsprite  -3, 4,  -1, 4, $00, $00
-	dsprite   1, 4,  -1, 4, $00, $00
-	dsprite  -4, 4,  -1, 4, $00, $00
-	dsprite   2, 4,  -1, 4, $00, $00
-
-Unknown_cfbf6:
-	dsprite  -2, 4,  -2, 4, $00, $00
-	dsprite  -2, 4,  -1, 4, $01, $00
-	dsprite  -2, 4,   0, 4, $02, $00
-	dsprite  -1, 4,  -2, 4, $03, $00
-	dsprite  -1, 4,  -1, 4, $04, $00
-	dsprite  -1, 4,   0, 4, $05, $00
-	dsprite   0, 4,  -2, 4, $00, $40
-	dsprite   0, 4,  -1, 4, $01, $40
-	dsprite   0, 4,   0, 4, $02, $40
-
-Unknown_cfc1a:
-	dsprite  -1, 4,  -2, 0, $00, $00
-	dsprite  -1, 4,  -1, 0, $01, $00
-	dsprite  -1, 4,   0, 0, $01, $20
-	dsprite  -1, 4,   1, 0, $00, $20
-
-Unknown_cfc2a:
-	dsprite  -1, 4,  -3, 0, $00, $00
-	dsprite  -1, 4,  -2, 0, $01, $00
-	dsprite  -1, 4,  -1, 0, $02, $00
-	dsprite  -1, 4,   0, 0, $02, $20
-	dsprite  -1, 4,   1, 0, $01, $20
-	dsprite  -1, 4,   2, 0, $00, $20
-
-Unknown_cfc42:
-	dsprite  -2, 0,  -2, 0, $00, $00
-	dsprite  -2, 0,  -1, 0, $01, $00
-	dsprite  -2, 0,   0, 0, $02, $00
-	dsprite  -2, 0,   1, 0, $00, $20
-	dsprite  -1, 0,  -2, 0, $03, $00
-	dsprite  -1, 0,  -1, 0, $04, $00
-	dsprite  -1, 0,   0, 0, $04, $20
-	dsprite  -1, 0,   1, 0, $05, $00
-	dsprite   0, 0,  -2, 0, $05, $60
-	dsprite   0, 0,  -1, 0, $04, $40
-	dsprite   0, 0,   0, 0, $04, $60
-	dsprite   0, 0,   1, 0, $03, $60
-	dsprite   1, 0,  -2, 0, $00, $40
-	dsprite   1, 0,  -1, 0, $02, $60
-	dsprite   1, 0,   0, 0, $01, $60
-	dsprite   1, 0,   1, 0, $00, $60
-
-Unknown_cfc82:
-	dsprite  -1, 0,  -2, 0, $00, $00
-	dsprite  -1, 0,  -1, 0, $01, $00
-	dsprite  -1, 0,   0, 0, $00, $60
-	dsprite   0, 0,  -1, 0, $00, $00
-	dsprite   0, 0,   0, 0, $01, $00
-	dsprite   0, 0,   1, 0, $00, $60
-
-Unknown_cfc9a:
-	dsprite  -1, 0,   1, 4, $00, $00
-	dsprite  -1, 0,   2, 4, $01, $00
-	dsprite   0, 0,  -1, 4, $02, $00
-	dsprite   0, 0,   0, 4, $03, $00
-	dsprite   0, 0,   1, 4, $04, $00
-	dsprite   0, 0,   2, 4, $05, $00
-
-Unknown_cfcb2:
-	dsprite  -1, 0,  -1, 0, $00, $00
-	dsprite  -1, 0,   0, 0, $01, $60
-	dsprite   0, 0,  -1, 0, $01, $00
-	dsprite   0, 0,   0, 0, $01, $20
-
-Unknown_cfcc2:
-	dsprite  -2, 0, -13, 4, $00, $00
-	dsprite  -4, 0, -11, 4, $00, $00
-	dsprite  -1, 0,  -9, 4, $00, $00
-	dsprite  -5, 0,  -7, 4, $00, $00
-	dsprite  -3, 0,  -5, 4, $00, $00
-	dsprite  -5, 0,  -3, 4, $00, $00
-	dsprite  -3, 0,  -1, 4, $00, $00
-	dsprite  -3, 0,   0, 4, $00, $00
-	dsprite  -5, 0,   2, 4, $00, $00
-	dsprite   0, 0,   4, 4, $00, $00
-	dsprite  -2, 0,   6, 4, $00, $00
-	dsprite  -4, 0,   8, 4, $00, $00
-	dsprite  -2, 0,  10, 4, $00, $00
-; cfcf6
+
+BattleAnimOAMData: ; ceeae
+; vtile offset (?), length, address
+	dbbw $00, 16, .OAMData_00 ; 00
+	dbbw $04,  9, .OAMData_01 ; 01
+	dbbw $08,  4, .OAMData_02 ; 02
+	dbbw $09,  4, .OAMData_03 ; 03
+	dbbw $0d,  4, .OAMData_04 ; 04
+	dbbw $0f,  4, .OAMData_03 ; 05
+	dbbw $13,  4, .OAMData_04 ; 06
+	dbbw $04, 16, .OAMData_00 ; 07
+	dbbw $08, 16, .OAMData_00 ; 08
+	dbbw $08, 16, .OAMData_09 ; 09
+	dbbw $00,  4, .OAMData_04 ; 0a
+	dbbw $02,  4, .OAMData_03 ; 0b
+	dbbw $06,  2, .OAMData_0c ; 0c
+	dbbw $07,  2, .OAMData_0c ; 0d
+	dbbw $02,  4, .OAMData_04 ; 0e
+	dbbw $04,  1, .OAMData_0f ; 0f
+	dbbw $05,  1, .OAMData_0f ; 10
+	dbbw $00,  2, .OAMData_11 ; 11
+	dbbw $02,  2, .OAMData_11 ; 12
+	dbbw $00,  4, .OAMData_13 ; 13
+	dbbw $00,  1, .OAMData_0f ; 14
+	dbbw $01,  1, .OAMData_0f ; 15
+	dbbw $02,  1, .OAMData_0f ; 16
+	dbbw $03,  1, .OAMData_0f ; 17
+	dbbw $00,  4, .OAMData_02 ; 18
+	dbbw $01, 16, .OAMData_00 ; 19
+	dbbw $05, 16, .OAMData_00 ; 1a
+	dbbw $00,  4, .OAMData_03 ; 1b
+	dbbw $05, 12, .OAMData_1c ; 1c
+	dbbw $02,  4, .OAMData_02 ; 1d
+	dbbw $06,  1, .OAMData_0f ; 1e
+	dbbw $07,  1, .OAMData_0f ; 1f
+	dbbw $08,  1, .OAMData_0f ; 20
+	dbbw $04,  4, .OAMData_03 ; 21
+	dbbw $09, 22, .OAMData_22 ; 22
+	dbbw $04,  2, .OAMData_11 ; 23
+	dbbw $06,  2, .OAMData_11 ; 24
+	dbbw $0c,  1, .OAMData_0f ; 25
+	dbbw $0a,  1, .OAMData_0f ; 26
+	dbbw $0b,  4, .OAMData_02 ; 27
+	dbbw $08,  4, .OAMData_04 ; 28
+	dbbw $06,  4, .OAMData_04 ; 29
+	dbbw $00,  5, .OAMData_2a ; 2a
+	dbbw $03,  6, .OAMData_2b ; 2b
+	dbbw $00,  7, .OAMData_2c ; 2c
+	dbbw $03,  8, .OAMData_2d ; 2d
+	dbbw $00,  9, .OAMData_2e ; 2e
+	dbbw $00,  4, .OAMData_2f ; 2f
+	dbbw $02,  4, .OAMData_30 ; 30
+	dbbw $04,  6, .OAMData_31 ; 31
+	dbbw $00,  2, .OAMData_32 ; 32
+	dbbw $00,  7, .OAMData_33 ; 33
+	dbbw $00, 14, .OAMData_32 ; 34
+	dbbw $00, 21, .OAMData_33 ; 35
+	dbbw $00,  2, .OAMData_36 ; 36
+	dbbw $00,  6, .OAMData_36 ; 37
+	dbbw $00, 10, .OAMData_36 ; 38
+	dbbw $00, 14, .OAMData_36 ; 39
+	dbbw $00,  2, .OAMData_3a ; 3a
+	dbbw $00,  6, .OAMData_3a ; 3b
+	dbbw $00, 10, .OAMData_3a ; 3c
+	dbbw $00, 14, .OAMData_3a ; 3d
+	dbbw $00,  4, .OAMData_3e ; 3e
+	dbbw $00, 16, .OAMData_3e ; 3f
+	dbbw $00, 26, .OAMData_3e ; 40
+	dbbw $00, 26, .OAMData_41 ; 41
+	dbbw $0e,  4, .OAMData_42 ; 42
+	dbbw $0e,  8, .OAMData_42 ; 43
+	dbbw $0e,  4, .OAMData_44 ; 44
+	dbbw $0e,  8, .OAMData_44 ; 45
+	dbbw $0e,  4, .OAMData_46 ; 46
+	dbbw $0e,  4, .OAMData_47 ; 47
+	dbbw $00,  6, .OAMData_48 ; 48
+	dbbw $03,  4, .OAMData_49 ; 49
+	dbbw $03,  2, .OAMData_4a ; 4a
+	dbbw $01,  5, .OAMData_0f ; 4b
+	dbbw $01,  6, .OAMData_4c ; 4c
+	dbbw $01,  7, .OAMData_4d ; 4d
+	dbbw $01,  3, .OAMData_4d ; 4e
+	dbbw $01,  8, .OAMData_4f ; 4f
+	dbbw $01,  9, .OAMData_50 ; 50
+	dbbw $01, 10, .OAMData_51 ; 51
+	dbbw $01,  6, .OAMData_51 ; 52
+	dbbw $00,  9, .OAMData_01 ; 53
+	dbbw $04,  4, .OAMData_02 ; 54
+	dbbw $05,  4, .OAMData_02 ; 55
+	dbbw $00,  2, .OAMData_56 ; 56
+	dbbw $02,  2, .OAMData_56 ; 57
+	dbbw $04,  2, .OAMData_56 ; 58
+	dbbw $02,  4, .OAMData_59 ; 59
+	dbbw $02,  4, .OAMData_5a ; 5a
+	dbbw $02,  2, .OAMData_0c ; 5b
+	dbbw $04,  2, .OAMData_0c ; 5c
+	dbbw $06,  4, .OAMData_5d ; 5d
+	dbbw $08,  2, .OAMData_0c ; 5e
+	dbbw $09,  2, .OAMData_0c ; 5f
+	dbbw $05,  2, .OAMData_60 ; 60
+	dbbw $00,  2, .OAMData_61 ; 61
+	dbbw $00,  5, .OAMData_61 ; 62
+	dbbw $00,  9, .OAMData_61 ; 63
+	dbbw $09,  9, .OAMData_61 ; 64
+	dbbw $00,  4, .OAMData_65 ; 65
+	dbbw $00,  7, .OAMData_65 ; 66
+	dbbw $00,  9, .OAMData_65 ; 67
+	dbbw $09,  9, .OAMData_65 ; 68
+	dbbw $04,  1, .OAMData_69 ; 69
+	dbbw $05,  2, .OAMData_6a ; 6a
+	dbbw $06,  4, .OAMData_03 ; 6b
+	dbbw $0a,  4, .OAMData_03 ; 6c
+	dbbw $0e,  4, .OAMData_03 ; 6d
+	dbbw $08,  5, .OAMData_6e ; 6e
+	dbbw $0d,  3, .OAMData_6f ; 6f
+	dbbw $01,  8, .OAMData_70 ; 70
+	dbbw $03,  8, .OAMData_70 ; 71
+	dbbw $05,  8, .OAMData_70 ; 72
+	dbbw $07,  8, .OAMData_70 ; 73
+	dbbw $06,  4, .OAMData_02 ; 74
+	dbbw $07,  4, .OAMData_02 ; 75
+	dbbw $0a,  2, .OAMData_76 ; 76
+	dbbw $00,  1, .OAMData_77 ; 77
+	dbbw $00,  3, .OAMData_78 ; 78
+	dbbw $00,  6, .OAMData_79 ; 79
+	dbbw $00,  9, .OAMData_7a ; 7a
+	dbbw $00, 12, .OAMData_7b ; 7b
+	dbbw $00, 14, .OAMData_7c ; 7c
+	dbbw $00, 15, .OAMData_7d ; 7d
+	dbbw $04,  4, .OAMData_03 ; 7e
+	dbbw $08,  4, .OAMData_03 ; 7f
+	dbbw $0d,  1, .OAMData_0f ; 80
+	dbbw $0e,  4, .OAMData_81 ; 81
+	dbbw $10,  1, .OAMData_0f ; 82
+	dbbw $11,  1, .OAMData_0f ; 83
+	dbbw $04,  2, .OAMData_6a ; 84
+	dbbw $05,  2, .OAMData_6a ; 85
+	dbbw $0a,  4, .OAMData_04 ; 86
+	dbbw $00,  8, .OAMData_87 ; 87
+	dbbw $00, 12, .OAMData_88 ; 88
+	dbbw $00, 16, .OAMData_87 ; 89
+	dbbw $09,  2, .OAMData_8a ; 8a
+	dbbw $09,  4, .OAMData_8a ; 8b
+	dbbw $09,  6, .OAMData_8a ; 8c
+	dbbw $09,  8, .OAMData_8a ; 8d
+	dbbw $12,  5, .OAMData_8e ; 8e
+	dbbw $00,  4, .OAMData_8f ; 8f
+	dbbw $04,  4, .OAMData_8f ; 90
+	dbbw $08,  4, .OAMData_8f ; 91
+	dbbw $0c,  4, .OAMData_8f ; 92
+	dbbw $00,  6, .OAMData_93 ; 93
+	dbbw $04,  4, .OAMData_03 ; 94
+	dbbw $0a,  4, .OAMData_04 ; 95
+	dbbw $15,  4, .OAMData_30 ; 96
+	dbbw $04,  4, .OAMData_30 ; 97
+	dbbw $0c,  4, .OAMData_04 ; 98
+	dbbw $0a,  4, .OAMData_99 ; 99
+	dbbw $0c,  4, .OAMData_03 ; 9a
+	dbbw $00, 36, .OAMData_9b ; 9b
+	dbbw $0d,  2, .OAMData_9c ; 9c
+	dbbw $0d,  4, .OAMData_9c ; 9d
+	dbbw $0d,  6, .OAMData_9c ; 9e
+	dbbw $02,  8, .OAMData_9f ; 9f
+	dbbw $08,  7, .OAMData_a0 ; a0
+	dbbw $08,  5, .OAMData_a0 ; a1
+	dbbw $08,  3, .OAMData_a0 ; a2
+	dbbw $00, 16, .OAMData_1c ; a3
+	dbbw $00,  9, .OAMData_a4 ; a4
+	dbbw $06,  9, .OAMData_a4 ; a5
+	dbbw $0c,  9, .OAMData_a4 ; a6
+	dbbw $12,  9, .OAMData_a4 ; a7
+	dbbw $18,  9, .OAMData_a4 ; a8
+	dbbw $1e,  9, .OAMData_a4 ; a9
+	dbbw $24,  9, .OAMData_a4 ; aa
+	dbbw $2a,  9, .OAMData_a4 ; ab
+	dbbw $03,  4, .OAMData_ac ; ac
+	dbbw $12,  4, .OAMData_03 ; ad
+	dbbw $10,  4, .OAMData_04 ; ae
+	dbbw $16,  1, .OAMData_0f ; af
+	dbbw $17,  4, .OAMData_02 ; b0
+	dbbw $18,  4, .OAMData_03 ; b1
+	dbbw $1c,  4, .OAMData_03 ; b2
+	dbbw $20,  3, .OAMData_03 ; b3
+	dbbw $23,  4, .OAMData_04 ; b4
+	dbbw $25,  3, .OAMData_03 ; b5
+	dbbw $17,  4, .OAMData_03 ; b6
+	dbbw $0a, 16, .OAMData_00 ; b7
+	dbbw $10, 16, .OAMData_1c ; b8
+	dbbw $00, 16, .OAMData_1c ; b9
+	dbbw $04,  4, .OAMData_03 ; ba
+	dbbw $08,  2, .OAMData_11 ; bb
+	dbbw $20,  6, .OAMData_bc ; bc
+	dbbw $08,  1, .OAMData_0f ; bd
+	dbbw $04,  4, .OAMData_03 ; be
+	dbbw $1a,  4, .OAMData_30 ; bf
+	dbbw $16,  9, .OAMData_01 ; c0
+	dbbw $10, 16, .OAMData_c1 ; c1
+	dbbw $09,  6, .OAMData_c2 ; c2
+	dbbw $11,  9, .OAMData_c3 ; c3
+	dbbw $0e,  4, .OAMData_03 ; c4
+	dbbw $0b,  4, .OAMData_30 ; c5
+	dbbw $1c,  6, .OAMData_02 ; c6
+	dbbw $20, 16, .OAMData_c1 ; c7
+	dbbw $05,  6, .OAMData_c8 ; c8
+	dbbw $0b,  4, .OAMData_03 ; c9
+	dbbw $09,  4, .OAMData_ca ; ca
+	dbbw $0b,  4, .OAMData_04 ; cb
+	dbbw $11, 13, .OAMData_cc ; cc
+	dbbw $00,  9, .OAMData_c3 ; cd
+	dbbw $09,  9, .OAMData_c3 ; ce
+	dbbw $00, 12, .OAMData_cf ; cf
+	dbbw $06, 12, .OAMData_cf ; d0
+	dbbw $0c, 12, .OAMData_cf ; d1
+	dbbw $12, 12, .OAMData_cf ; d2
+	dbbw $00, 13, .OAMData_cc ; d3
+	dbbw $00,  7, .OAMData_d4 ; d4
+	dbbw $00,  6, .OAMData_d5 ; d5
+	dbbw $00, 14, .OAMData_d6 ; d6
+	dbbw $00, 12, .OAMData_d7 ; d7
+
+.OAMData_11
+	dsprite  -1, 0,  -1, 4, $00, $00
+	dsprite   0, 0,  -1, 4, $01, $00
+
+.OAMData_56
+	dsprite  -1, 4,  -1, 0, $00, $00
+	dsprite  -1, 4,   0, 0, $01, $00
+
+.OAMData_03
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $00
+	dsprite   0, 0,  -1, 0, $02, $00
+	dsprite   0, 0,   0, 0, $03, $00
+
+.OAMData_02
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $00, $20
+	dsprite   0, 0,  -1, 0, $00, $40
+	dsprite   0, 0,   0, 0, $00, $60
+
+.OAMData_c3
+	dsprite  -2, 4,  -2, 4, $00, $00
+	dsprite  -2, 4,  -1, 4, $01, $00
+	dsprite  -2, 4,   0, 4, $02, $00
+	dsprite  -1, 4,  -2, 4, $03, $00
+	dsprite  -1, 4,  -1, 4, $04, $00
+	dsprite  -1, 4,   0, 4, $05, $00
+	dsprite   0, 4,  -2, 4, $06, $00
+	dsprite   0, 4,  -1, 4, $07, $00
+	dsprite   0, 4,   0, 4, $08, $00
+
+.OAMData_01
+	dsprite  -2, 4,  -2, 4, $00, $00
+	dsprite  -2, 4,  -1, 4, $01, $00
+	dsprite  -2, 4,   0, 4, $00, $20
+	dsprite  -1, 4,  -2, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $03, $00
+	dsprite  -1, 4,   0, 4, $02, $60
+	dsprite   0, 4,  -2, 4, $00, $40
+	dsprite   0, 4,  -1, 4, $01, $60
+	dsprite   0, 4,   0, 4, $00, $60
+
+.OAMData_cf
+	dsprite  -2, 0,  -2, 4, $00, $00
+	dsprite  -2, 0,  -1, 4, $01, $00
+	dsprite  -2, 0,   0, 4, $02, $00
+	dsprite  -1, 0,  -2, 4, $03, $00
+	dsprite  -1, 0,  -1, 4, $04, $00
+	dsprite  -1, 0,   0, 4, $05, $00
+	dsprite   0, 0,  -2, 4, $05, $60
+	dsprite   0, 0,  -1, 4, $04, $60
+	dsprite   0, 0,   0, 4, $03, $60
+	dsprite   1, 0,  -2, 4, $02, $60
+	dsprite   1, 0,  -1, 4, $01, $60
+	dsprite   1, 0,   0, 4, $00, $60
+
+.OAMData_1c
+	dsprite  -2, 0,  -2, 0, $00, $00
+	dsprite  -2, 0,  -1, 0, $01, $00
+	dsprite  -2, 0,   0, 0, $02, $00
+	dsprite  -2, 0,   1, 0, $03, $00
+	dsprite  -1, 0,  -2, 0, $04, $00
+	dsprite  -1, 0,  -1, 0, $05, $00
+	dsprite  -1, 0,   0, 0, $06, $00
+	dsprite  -1, 0,   1, 0, $07, $00
+	dsprite   0, 0,  -2, 0, $08, $00
+	dsprite   0, 0,  -1, 0, $09, $00
+	dsprite   0, 0,   0, 0, $0a, $00
+	dsprite   0, 0,   1, 0, $0b, $00
+	dsprite   1, 0,  -2, 0, $0c, $00
+	dsprite   1, 0,  -1, 0, $0d, $00
+	dsprite   1, 0,   0, 0, $0e, $00
+	dsprite   1, 0,   1, 0, $0f, $00
+
+.OAMData_00
+	dsprite  -2, 0,  -2, 0, $00, $00
+	dsprite  -2, 0,  -1, 0, $01, $00
+	dsprite  -1, 0,  -2, 0, $02, $00
+	dsprite  -1, 0,  -1, 0, $03, $00
+	dsprite  -2, 0,   0, 0, $01, $20
+	dsprite  -2, 0,   1, 0, $00, $20
+	dsprite  -1, 0,   0, 0, $03, $20
+	dsprite  -1, 0,   1, 0, $02, $20
+	dsprite   0, 0,  -2, 0, $02, $40
+	dsprite   0, 0,  -1, 0, $03, $40
+	dsprite   1, 0,  -2, 0, $00, $40
+	dsprite   1, 0,  -1, 0, $01, $40
+	dsprite   0, 0,   0, 0, $03, $60
+	dsprite   0, 0,   1, 0, $02, $60
+	dsprite   1, 0,   0, 0, $01, $60
+	dsprite   1, 0,   1, 0, $00, $60
+
+.OAMData_09
+	dsprite  -3, 4,  -3, 4, $00, $00
+	dsprite  -3, 4,  -2, 4, $01, $00
+	dsprite  -2, 4,  -3, 4, $02, $00
+	dsprite  -2, 4,  -2, 4, $03, $00
+	dsprite  -3, 4,   0, 4, $01, $20
+	dsprite  -3, 4,   1, 4, $00, $20
+	dsprite  -2, 4,   0, 4, $03, $20
+	dsprite  -2, 4,   1, 4, $02, $20
+	dsprite   0, 4,  -3, 4, $02, $40
+	dsprite   0, 4,  -2, 4, $03, $40
+	dsprite   1, 4,  -3, 4, $00, $40
+	dsprite   1, 4,  -2, 4, $01, $40
+	dsprite   0, 4,   0, 4, $03, $60
+	dsprite   0, 4,   1, 4, $02, $60
+	dsprite   1, 4,   0, 4, $01, $60
+	dsprite   1, 4,   1, 4, $00, $60
+
+.OAMData_0c
+	dsprite  -1, 4,  -1, 0, $00, $00
+	dsprite  -1, 4,   0, 0, $00, $20
+
+.OAMData_6a
+	dsprite   0, 0,  -1, 0, $00, $00
+	dsprite   0, 0,   0, 0, $00, $20
+
+.OAMData_04
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $00, $20
+	dsprite   0, 0,  -1, 0, $01, $00
+	dsprite   0, 0,   0, 0, $01, $20
+
+.OAMData_5d
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $00
+	dsprite   0, 0,  -1, 0, $00, $40
+	dsprite   0, 0,   0, 0, $01, $40
+
+.OAMData_13
+	dsprite  -1, 2,  -1, 0, $02, $00
+	dsprite   0, 2,  -1, 0, $03, $00
+	dsprite  -2, 6,   0, 0, $02, $00
+	dsprite  -1, 6,   0, 0, $03, $00
+
+.OAMData_22
+	dsprite   1, 0, -11, 0, $01, $00
+	dsprite   0, 0, -10, 0, $02, $00
+	dsprite   0, 0,  -9, 0, $03, $00
+	dsprite   0, 0,  -8, 0, $00, $00
+	dsprite   0, 0,  -7, 0, $03, $00
+	dsprite   0, 0,  -6, 0, $00, $00
+	dsprite   0, 0,  -5, 0, $03, $00
+	dsprite   0, 0,  -4, 0, $00, $00
+	dsprite   0, 0,  -3, 0, $03, $00
+	dsprite   0, 0,  -2, 0, $00, $00
+	dsprite   0, 0,  -1, 0, $01, $00
+	dsprite  -1, 0,   0, 0, $02, $00
+	dsprite  -1, 0,   1, 0, $03, $00
+	dsprite  -1, 0,   2, 0, $00, $00
+	dsprite  -1, 0,   3, 0, $03, $00
+	dsprite  -1, 0,   4, 0, $00, $00
+	dsprite  -1, 0,   5, 0, $03, $00
+	dsprite  -1, 0,   6, 0, $00, $00
+	dsprite  -1, 0,   7, 0, $03, $00
+	dsprite  -1, 0,   8, 0, $00, $00
+	dsprite  -1, 0,   9, 0, $01, $00
+	dsprite  -2, 0,  10, 0, $02, $00
+
+.OAMData_2a
+	dsprite  -3, 4,  -1, 0, $00, $00
+	dsprite  -3, 4,   0, 0, $00, $20
+	dsprite  -2, 4,  -1, 0, $01, $00
+	dsprite  -2, 4,   0, 0, $01, $20
+	dsprite  -1, 4,  -1, 4, $02, $00
+
+.OAMData_2b
+	dsprite  -4, 4,  -1, 0, $00, $00
+	dsprite  -4, 4,   0, 0, $00, $20
+	dsprite  -3, 4,  -1, 0, $01, $00
+	dsprite  -3, 4,   0, 0, $01, $20
+	dsprite  -2, 4,  -1, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+
+.OAMData_2c
+	dsprite  -5, 4,  -1, 0, $00, $00
+	dsprite  -5, 4,   0, 0, $00, $20
+	dsprite  -4, 4,  -1, 0, $01, $00
+	dsprite  -4, 4,   0, 0, $01, $20
+	dsprite  -3, 4,  -1, 4, $02, $00
+	dsprite  -2, 4,  -1, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+
+.OAMData_2d
+	dsprite  -6, 4,  -1, 0, $00, $00
+	dsprite  -6, 4,   0, 0, $00, $20
+	dsprite  -5, 4,  -1, 0, $01, $00
+	dsprite  -5, 4,   0, 0, $01, $20
+	dsprite  -4, 4,  -1, 4, $02, $00
+	dsprite  -3, 4,  -1, 4, $02, $00
+	dsprite  -2, 4,  -1, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+
+.OAMData_2e
+	dsprite  -7, 4,  -1, 0, $00, $00
+	dsprite  -7, 4,   0, 0, $00, $20
+	dsprite  -6, 4,  -1, 0, $01, $00
+	dsprite  -6, 4,   0, 0, $01, $20
+	dsprite  -5, 4,  -1, 4, $02, $00
+	dsprite  -4, 4,  -1, 4, $02, $00
+	dsprite  -3, 4,  -1, 4, $02, $00
+	dsprite  -2, 4,  -1, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+
+.OAMData_2f
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $00, $20
+	dsprite   0, 0,  -1, 0, $01, $00
+	dsprite   0, 0,   0, 0, $00, $60
+
+.OAMData_30
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $00
+	dsprite   0, 0,  -1, 0, $01, $60
+	dsprite   0, 0,   0, 0, $00, $60
+
+.OAMData_31
+	dsprite  -2, 4,  -1, 0, $00, $00
+	dsprite  -2, 4,   0, 0, $01, $00
+	dsprite  -1, 4,  -1, 0, $02, $00
+	dsprite  -1, 4,   0, 0, $03, $00
+	dsprite   0, 4,  -1, 0, $04, $00
+	dsprite   0, 4,   0, 0, $05, $00
+
+.OAMData_76
+	dsprite  -1, 5,  -1, 0, $00, $00
+	dsprite  -1, 1,   0, 0, $00, $00
+
+.OAMData_32
+	dsprite  -1, 0,  -2, 4, $00, $00
+	dsprite  -1, 0,   0, 4, $00, $00
+	dsprite  -3, 0,  -2, 4, $00, $00
+	dsprite  -3, 0,   0, 4, $00, $00
+	dsprite  -2, 0,  -3, 4, $00, $00
+	dsprite  -2, 0,  -2, 4, $01, $00
+	dsprite  -2, 0,  -1, 4, $00, $00
+	dsprite  -2, 0,   0, 4, $01, $00
+	dsprite  -2, 0,   1, 4, $00, $00
+	dsprite  -1, 0,  -4, 4, $00, $00
+	dsprite  -1, 0,  -3, 4, $01, $00
+	dsprite  -1, 0,  -1, 4, $01, $00
+	dsprite  -1, 0,   1, 4, $01, $00
+	dsprite  -1, 0,   2, 4, $00, $00
+
+.OAMData_33
+	dsprite  -2, 0,  -2, 4, $00, $00
+	dsprite  -2, 0,   0, 4, $00, $00
+	dsprite  -1, 0,  -3, 4, $00, $00
+	dsprite  -1, 0,  -2, 4, $01, $00
+	dsprite  -1, 0,  -1, 4, $00, $00
+	dsprite  -1, 0,   0, 4, $01, $00
+	dsprite  -1, 0,   1, 4, $00, $00
+	dsprite  -4, 0,  -2, 4, $00, $00
+	dsprite  -4, 0,   0, 4, $00, $00
+	dsprite  -3, 0,  -3, 4, $00, $00
+	dsprite  -3, 0,  -2, 4, $01, $00
+	dsprite  -3, 0,  -1, 4, $00, $00
+	dsprite  -3, 0,   0, 4, $01, $00
+	dsprite  -3, 0,   1, 4, $00, $00
+	dsprite  -2, 0,  -4, 4, $00, $00
+	dsprite  -2, 0,  -3, 4, $01, $00
+	dsprite  -2, 0,  -1, 4, $01, $00
+	dsprite  -2, 0,   1, 4, $01, $00
+	dsprite  -2, 0,   2, 4, $00, $00
+	dsprite  -1, 0,  -4, 4, $01, $00
+	dsprite  -1, 0,   2, 4, $01, $00
+
+.OAMData_36
+	dsprite  -7, 4,  -1, 0, $00, $00
+	dsprite  -7, 4,   0, 0, $01, $00
+	dsprite  -6, 4,  -1, 0, $02, $00
+	dsprite  -6, 4,   0, 0, $03, $00
+	dsprite  -5, 4,  -1, 0, $04, $00
+	dsprite  -5, 4,   0, 0, $05, $00
+	dsprite  -4, 4,  -1, 0, $06, $00
+	dsprite  -4, 4,   0, 0, $07, $00
+	dsprite  -3, 4,  -1, 0, $08, $00
+	dsprite  -3, 4,   0, 0, $09, $00
+	dsprite  -2, 4,  -1, 0, $0a, $00
+	dsprite  -2, 4,   0, 0, $0b, $00
+	dsprite  -1, 4,  -1, 0, $0c, $00
+	dsprite  -1, 4,   0, 0, $0d, $00
+
+.OAMData_3a
+	dsprite  -7, 4,  -1, 0, $0c, $00
+	dsprite  -7, 4,   0, 0, $0d, $00
+	dsprite  -6, 4,  -1, 0, $08, $00
+	dsprite  -6, 4,   0, 0, $09, $00
+	dsprite  -5, 4,  -1, 0, $04, $00
+	dsprite  -5, 4,   0, 0, $05, $00
+	dsprite  -4, 4,  -1, 0, $00, $00
+	dsprite  -4, 4,   0, 0, $01, $00
+	dsprite  -3, 4,  -1, 0, $02, $00
+	dsprite  -3, 4,   0, 0, $03, $00
+	dsprite  -2, 4,   0, 0, $02, $00
+	dsprite  -2, 4,   1, 0, $03, $00
+	dsprite  -1, 4,   0, 0, $0a, $00
+	dsprite  -1, 4,   1, 0, $0b, $00
+
+.OAMData_3e
+	dsprite   1, 4,  -2, 0, $00, $40
+	dsprite   1, 4,  -1, 0, $02, $40
+	dsprite   1, 4,   0, 0, $02, $60
+	dsprite   1, 4,   1, 0, $00, $60
+	dsprite  -1, 4,  -3, 0, $09, $20
+	dsprite  -1, 4,  -2, 0, $08, $20
+	dsprite  -1, 4,  -1, 0, $06, $00
+	dsprite  -1, 4,   0, 0, $07, $00
+	dsprite  -1, 4,   1, 0, $08, $00
+	dsprite  -1, 4,   2, 0, $09, $00
+	dsprite   0, 4,  -3, 0, $01, $20
+	dsprite   0, 4,  -2, 0, $00, $20
+	dsprite   0, 4,  -1, 0, $0c, $00
+	dsprite   0, 4,   0, 0, $0d, $00
+	dsprite   0, 4,   1, 0, $00, $00
+	dsprite   0, 4,   2, 0, $01, $00
+	dsprite  -3, 4,  -2, 0, $00, $00
+	dsprite  -3, 4,  -1, 0, $02, $00
+	dsprite  -3, 4,   0, 0, $02, $20
+	dsprite  -3, 4,   1, 0, $00, $20
+	dsprite  -2, 4,  -3, 0, $03, $20
+	dsprite  -2, 4,  -2, 0, $02, $20
+	dsprite  -2, 4,  -1, 0, $04, $00
+	dsprite  -2, 4,   0, 0, $05, $00
+	dsprite  -2, 4,   1, 0, $02, $00
+	dsprite  -2, 4,   2, 0, $03, $00
+
+.OAMData_41
+	dsprite  -3, 4,  -2, 0, $00, $00
+	dsprite  -3, 4,  -1, 0, $02, $00
+	dsprite  -3, 4,   0, 0, $02, $20
+	dsprite  -3, 4,   1, 0, $00, $20
+	dsprite  -2, 4,  -3, 4, $00, $00
+	dsprite  -2, 4,  -2, 4, $01, $00
+	dsprite  -2, 4,  -1, 0, $05, $20
+	dsprite  -2, 4,   0, 0, $04, $20
+	dsprite  -2, 4,   0, 4, $01, $20
+	dsprite  -2, 4,   1, 4, $00, $20
+	dsprite  -1, 4,  -3, 4, $02, $00
+	dsprite  -1, 4,  -2, 4, $03, $00
+	dsprite  -1, 4,  -1, 0, $07, $20
+	dsprite  -1, 4,   0, 0, $06, $20
+	dsprite  -1, 4,   0, 4, $03, $20
+	dsprite  -1, 4,   1, 4, $02, $20
+	dsprite   0, 4,  -3, 4, $04, $00
+	dsprite   0, 4,  -2, 4, $05, $00
+	dsprite   0, 4,  -1, 0, $0d, $20
+	dsprite   0, 4,   0, 0, $0c, $20
+	dsprite   0, 4,   0, 4, $05, $20
+	dsprite   0, 4,   1, 4, $04, $20
+	dsprite   1, 4,  -2, 0, $00, $40
+	dsprite   1, 4,  -1, 0, $02, $40
+	dsprite   1, 4,   0, 0, $02, $60
+	dsprite   1, 4,   1, 0, $00, $60
+
+.OAMData_42
+	dsprite  -3, 0,  -1, 4, $02, $00
+	dsprite   2, 0,  -1, 4, $02, $60
+	dsprite  -1, 4,  -3, 0, $01, $00
+	dsprite  -1, 4,   2, 0, $01, $60
+	dsprite  -4, 0,  -1, 4, $02, $00
+	dsprite   3, 0,  -1, 4, $02, $60
+	dsprite  -1, 4,  -4, 0, $01, $00
+	dsprite  -1, 4,   3, 0, $01, $60
+
+.OAMData_44
+	dsprite  -3, 5,  -3, 5, $00, $20
+	dsprite  -3, 5,   1, 3, $00, $00
+	dsprite   1, 3,  -3, 5, $00, $60
+	dsprite   1, 3,   1, 3, $00, $40
+	dsprite  -4, 5,  -4, 5, $00, $20
+	dsprite  -4, 5,   2, 3, $00, $00
+	dsprite   2, 3,  -4, 5, $00, $60
+	dsprite   2, 3,   2, 3, $00, $40
+
+.OAMData_46
+	dsprite  -3, 4,  -1, 4, $02, $00
+	dsprite   1, 4,  -1, 4, $02, $60
+	dsprite  -1, 4,  -3, 4, $01, $00
+	dsprite  -1, 4,   1, 4, $01, $60
+
+.OAMData_47
+	dsprite  -2, 0,  -2, 0, $00, $20
+	dsprite  -2, 0,   1, 0, $00, $00
+	dsprite   1, 0,  -2, 0, $00, $60
+	dsprite   1, 0,   1, 0, $00, $40
+
+.OAMData_48
+	dsprite  -3, 0,  -1, 4, $00, $00
+	dsprite  -2, 0,  -1, 2, $00, $00
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite   0, 0,  -1, 0, $00, $00
+	dsprite   1, 0,  -1, 2, $00, $00
+	dsprite   2, 0,  -1, 4, $00, $00
+
+.OAMData_49
+	dsprite  -1, 4,  -2, 0, $00, $20
+	dsprite  -1, 2,  -1, 0, $00, $20
+	dsprite  -1, 2,   0, 0, $00, $00
+	dsprite  -1, 4,   1, 0, $00, $00
+
+.OAMData_4a
+	dsprite  -1, 4,  -1, 0, $00, $60
+	dsprite  -1, 4,   0, 0, $00, $40
+
+.OAMData_0f
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite  -1, 4,  -2, 4, $01, $00
+	dsprite  -1, 4,  -1, 4, $01, $20
+	dsprite   0, 4,  -2, 4, $01, $40
+	dsprite   0, 4,  -1, 4, $01, $60
+
+.OAMData_4c
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 2,  -2, 6, $00, $00
+	dsprite   0, 2,  -3, 6, $01, $00
+	dsprite   0, 2,  -2, 6, $01, $20
+	dsprite   1, 2,  -3, 6, $01, $40
+	dsprite   1, 2,  -2, 6, $01, $60
+
+.OAMData_4d
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 2,  -2, 6, $00, $00
+	dsprite   1, 0,  -2, 0, $00, $00
+	dsprite   1, 0,  -3, 0, $01, $00
+	dsprite   1, 0,  -2, 0, $01, $20
+	dsprite   2, 0,  -3, 0, $01, $40
+	dsprite   2, 0,  -2, 0, $01, $60
+
+.OAMData_4f
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 2,  -2, 6, $00, $00
+	dsprite   1, 0,  -2, 0, $00, $00
+	dsprite   1, 6,  -3, 2, $00, $00
+	dsprite   1, 6,  -4, 2, $01, $00
+	dsprite   1, 6,  -3, 2, $01, $20
+	dsprite   2, 6,  -4, 2, $01, $40
+	dsprite   2, 6,  -3, 2, $01, $60
+
+.OAMData_50
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 2,  -2, 6, $00, $00
+	dsprite   1, 0,  -2, 0, $00, $00
+	dsprite   1, 6,  -3, 2, $00, $00
+	dsprite   2, 4,  -4, 4, $00, $00
+	dsprite   2, 4,  -5, 4, $01, $00
+	dsprite   2, 4,  -4, 4, $01, $20
+	dsprite   3, 4,  -5, 4, $01, $40
+	dsprite   3, 4,  -4, 4, $01, $60
+
+.OAMData_51
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 2,  -2, 6, $00, $00
+	dsprite   1, 0,  -2, 0, $00, $00
+	dsprite   1, 6,  -3, 2, $00, $00
+	dsprite   2, 4,  -4, 4, $00, $00
+	dsprite   3, 2,  -5, 6, $00, $00
+	dsprite   3, 2,  -6, 6, $01, $00
+	dsprite   3, 2,  -5, 6, $01, $20
+	dsprite   4, 2,  -6, 6, $01, $40
+	dsprite   4, 2,  -5, 6, $01, $60
+
+.OAMData_59
+	dsprite  -1, 4,  -2, 0, $00, $00
+	dsprite  -1, 4,  -1, 0, $01, $00
+	dsprite  -1, 4,   0, 0, $01, $20
+	dsprite  -1, 4,   1, 0, $00, $20
+
+.OAMData_5a
+	dsprite  -1, 4,  -2, 0, $02, $00
+	dsprite  -1, 4,  -1, 0, $01, $00
+	dsprite  -1, 4,   0, 0, $01, $20
+	dsprite  -1, 4,   1, 0, $02, $20
+
+.OAMData_60
+	dsprite  -1, 0,  -1, 4, $00, $00
+
+.OAMData_69
+	dsprite   0, 0,  -1, 4, $00, $00
+
+.OAMData_61
+	dsprite  -1, 4,  -4, 4, $00, $00
+	dsprite  -1, 4,  -3, 4, $01, $00
+	dsprite  -1, 4,  -2, 4, $02, $00
+	dsprite  -1, 4,  -1, 4, $03, $00
+	dsprite  -1, 4,   0, 4, $04, $00
+	dsprite  -1, 4,   1, 4, $05, $00
+	dsprite  -1, 4,   2, 4, $06, $00
+	dsprite  -2, 4,   1, 4, $07, $00
+	dsprite  -2, 4,   2, 4, $08, $00
+
+.OAMData_65
+	dsprite  -2, 4,  -4, 4, $08, $20
+	dsprite  -2, 4,  -3, 4, $07, $20
+	dsprite  -1, 4,  -4, 4, $06, $20
+	dsprite  -1, 4,  -3, 4, $05, $20
+	dsprite  -1, 4,  -2, 4, $04, $20
+	dsprite  -1, 4,  -1, 4, $03, $20
+	dsprite  -1, 4,   0, 4, $02, $20
+	dsprite  -1, 4,   1, 4, $01, $20
+	dsprite  -1, 4,   2, 4, $00, $20
+
+.OAMData_d4
+	dsprite   0, 0,  -4, 4, $00, $10
+	dsprite   0, 0,  -3, 4, $01, $10
+	dsprite   0, 0,  -2, 4, $02, $10
+	dsprite   0, 0,  -1, 4, $03, $10
+	dsprite   0, 0,   0, 4, $04, $10
+	dsprite   0, 0,   1, 4, $05, $10
+	dsprite   0, 0,   2, 4, $06, $10
+
+.OAMData_d6
+	dsprite  -1, 0,  -4, 4, $00, $10
+	dsprite   0, 0,  -4, 4, $01, $10
+	dsprite  -1, 0,  -3, 4, $02, $10
+	dsprite   0, 0,  -3, 4, $03, $10
+	dsprite  -1, 0,  -2, 4, $04, $10
+	dsprite   0, 0,  -2, 4, $05, $10
+	dsprite  -1, 0,  -1, 4, $06, $10
+	dsprite   0, 0,  -1, 4, $07, $10
+	dsprite  -1, 0,   0, 4, $08, $10
+	dsprite   0, 0,   0, 4, $09, $10
+	dsprite  -1, 0,   1, 4, $0a, $10
+	dsprite   0, 0,   1, 4, $0b, $10
+	dsprite  -1, 0,   2, 4, $0c, $10
+	dsprite   0, 0,   2, 4, $0d, $10
+
+.OAMData_d5
+	dsprite   0, 0,  -3, 0, $00, $11
+	dsprite   0, 0,  -2, 0, $01, $11
+	dsprite   0, 0,  -1, 0, $02, $11
+	dsprite   0, 0,   0, 0, $03, $11
+	dsprite   0, 0,   1, 0, $04, $11
+	dsprite   0, 0,   2, 0, $05, $11
+
+.OAMData_d7
+	dsprite   0, 0,  -3, 0, $00, $11
+	dsprite   1, 0,  -3, 0, $01, $11
+	dsprite   0, 0,  -2, 0, $02, $11
+	dsprite   1, 0,  -2, 0, $03, $11
+	dsprite   0, 0,  -1, 0, $04, $11
+	dsprite   1, 0,  -1, 0, $05, $11
+	dsprite   0, 0,   0, 0, $06, $11
+	dsprite   1, 0,   0, 0, $07, $11
+	dsprite   0, 0,   1, 0, $08, $11
+	dsprite   1, 0,   1, 0, $09, $11
+	dsprite   0, 0,   2, 0, $0a, $11
+	dsprite   1, 0,   2, 0, $0b, $11
+
+.OAMData_6e
+	dsprite  -2, 4,   0, 4, $00, $00
+	dsprite  -1, 4,  -2, 4, $01, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+	dsprite  -1, 4,   0, 4, $03, $00
+	dsprite   0, 4,  -2, 4, $04, $00
+
+.OAMData_6f
+	dsprite  -1, 4,  -2, 4, $00, $00
+	dsprite  -1, 4,  -1, 4, $01, $00
+	dsprite  -1, 4,   0, 4, $02, $00
+
+.OAMData_77
+	dsprite  -4, 4,   1, 4, $01, $60
+
+.OAMData_78
+	dsprite  -4, 4,   1, 4, $00, $00
+	dsprite  -4, 4,   0, 4, $01, $60
+	dsprite  -3, 4,   1, 4, $01, $60
+
+.OAMData_79
+	dsprite  -4, 4,   1, 4, $01, $00
+	dsprite  -4, 4,   0, 4, $00, $00
+	dsprite  -4, 4,  -1, 4, $01, $60
+	dsprite  -3, 4,   1, 4, $00, $00
+	dsprite  -3, 4,   0, 4, $01, $60
+	dsprite  -2, 4,   1, 4, $01, $60
+
+.OAMData_7a
+	dsprite  -4, 4,  -2, 4, $01, $60
+	dsprite  -4, 4,  -1, 4, $00, $00
+	dsprite  -4, 4,   0, 4, $01, $00
+	dsprite  -3, 4,  -1, 4, $01, $60
+	dsprite  -3, 4,   0, 4, $00, $00
+	dsprite  -3, 4,   1, 4, $01, $00
+	dsprite  -2, 4,   0, 4, $01, $60
+	dsprite  -2, 4,   1, 4, $00, $00
+	dsprite  -1, 4,   1, 4, $01, $60
+
+.OAMData_7b
+	dsprite  -4, 4,  -3, 4, $01, $60
+	dsprite  -4, 4,  -2, 4, $00, $00
+	dsprite  -4, 4,  -1, 4, $01, $00
+	dsprite  -3, 4,  -2, 4, $01, $60
+	dsprite  -3, 4,  -1, 4, $00, $00
+	dsprite  -3, 4,   0, 4, $01, $00
+	dsprite  -2, 4,  -1, 4, $01, $60
+	dsprite  -2, 4,   0, 4, $00, $00
+	dsprite  -2, 4,   1, 4, $01, $00
+	dsprite  -1, 4,   0, 4, $01, $60
+	dsprite  -1, 4,   1, 4, $00, $00
+	dsprite   0, 4,   1, 4, $01, $60
+
+.OAMData_7c
+	dsprite  -4, 4,  -3, 4, $00, $00
+	dsprite  -4, 4,  -2, 4, $01, $00
+	dsprite  -3, 4,  -3, 4, $01, $60
+	dsprite  -3, 4,  -2, 4, $00, $00
+	dsprite  -3, 4,  -1, 4, $01, $00
+	dsprite  -2, 4,  -2, 4, $01, $60
+	dsprite  -2, 4,  -1, 4, $00, $00
+	dsprite  -2, 4,   0, 4, $01, $00
+	dsprite  -1, 4,  -1, 4, $01, $60
+	dsprite  -1, 4,   0, 4, $00, $00
+	dsprite  -1, 4,   1, 4, $01, $00
+	dsprite   0, 4,   0, 4, $01, $60
+	dsprite   0, 4,   1, 4, $00, $00
+	dsprite   1, 4,   1, 4, $01, $60
+
+.OAMData_7d
+	dsprite  -4, 4,  -3, 4, $01, $00
+	dsprite  -3, 4,  -3, 4, $00, $00
+	dsprite  -3, 4,  -2, 4, $01, $00
+	dsprite  -2, 4,  -3, 4, $01, $60
+	dsprite  -2, 4,  -2, 4, $00, $00
+	dsprite  -2, 4,  -1, 4, $01, $00
+	dsprite  -1, 4,  -2, 4, $01, $60
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite  -1, 4,   0, 4, $01, $00
+	dsprite   0, 4,  -1, 4, $01, $60
+	dsprite   0, 4,   0, 4, $00, $00
+	dsprite   0, 4,   1, 4, $01, $00
+	dsprite   1, 4,   0, 4, $01, $60
+	dsprite   1, 4,   1, 4, $00, $00
+	dsprite   2, 4,   1, 4, $01, $60
+
+.OAMData_70
+	dsprite  -2, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,  -1, 0, $01, $00
+	dsprite  -2, 0,   0, 0, $00, $20
+	dsprite  -1, 0,   0, 0, $01, $20
+	dsprite   0, 0,  -1, 0, $01, $40
+	dsprite   1, 0,  -1, 0, $00, $40
+	dsprite   0, 0,   0, 0, $01, $60
+	dsprite   1, 0,   0, 0, $00, $60
+
+.OAMData_81
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $00
+	dsprite   0, 0,  -1, 0, $01, $60
+	dsprite   0, 0,   0, 0, $00, $60
+
+.OAMData_87
+	dsprite  -2, 4,  -1, 0, $00, $00
+	dsprite  -2, 4,   0, 0, $01, $00
+	dsprite  -1, 4,  -1, 0, $02, $00
+	dsprite  -1, 4,   0, 0, $03, $00
+	dsprite  -1, 4,  -1, 0, $00, $00
+	dsprite  -1, 4,   0, 0, $01, $00
+	dsprite   0, 4,  -1, 0, $02, $00
+	dsprite   0, 4,   0, 0, $03, $00
+	dsprite  -3, 4,  -1, 0, $00, $00
+	dsprite  -3, 4,   0, 0, $01, $00
+	dsprite  -2, 4,  -1, 0, $02, $00
+	dsprite  -2, 4,   0, 0, $03, $00
+	dsprite   0, 4,  -1, 0, $00, $00
+	dsprite   0, 4,   0, 0, $01, $00
+	dsprite   1, 4,  -1, 0, $02, $00
+	dsprite   1, 4,   0, 0, $03, $00
+
+.OAMData_88
+	dsprite  -2, 0,  -1, 0, $00, $00
+	dsprite  -2, 0,   0, 0, $01, $00
+	dsprite  -1, 0,  -1, 0, $02, $00
+	dsprite  -1, 0,   0, 0, $03, $00
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $00
+	dsprite   0, 0,  -1, 0, $02, $00
+	dsprite   0, 0,   0, 0, $03, $00
+	dsprite   0, 0,  -1, 0, $00, $00
+	dsprite   0, 0,   0, 0, $01, $00
+	dsprite   1, 0,  -1, 0, $02, $00
+	dsprite   1, 0,   0, 0, $03, $00
+
+.OAMData_8a
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite  -1, 0,   0, 4, $00, $00
+	dsprite  -2, 4,   1, 4, $00, $00
+	dsprite  -2, 0,   2, 4, $00, $00
+	dsprite  -3, 4,   3, 4, $00, $00
+	dsprite  -3, 0,   4, 4, $00, $00
+	dsprite  -4, 0,   5, 4, $00, $00
+	dsprite  -5, 4,   6, 4, $00, $00
+
+.OAMData_8e
+	dsprite  -3, 4,  -1, 4, $00, $00
+	dsprite  -2, 4,  -1, 4, $01, $00
+	dsprite  -1, 4,  -1, 4, $02, $00
+	dsprite   0, 4,  -1, 4, $01, $40
+	dsprite   1, 4,  -1, 4, $00, $40
+
+.OAMData_8f
+	dsprite  -1, 4,  -2, 0, $00, $00
+	dsprite  -1, 4,  -1, 0, $01, $00
+	dsprite  -1, 4,   0, 0, $02, $00
+	dsprite  -1, 4,   1, 0, $03, $00
+
+.OAMData_93
+	dsprite  -1, 0,  -2, 4, $00, $00
+	dsprite  -1, 0,  -1, 4, $01, $00
+	dsprite  -1, 0,   0, 4, $02, $00
+	dsprite   0, 0,  -2, 4, $03, $00
+	dsprite   0, 0,  -1, 4, $04, $00
+	dsprite   0, 0,   0, 4, $05, $00
+
+.OAMData_99
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $05, $00
+	dsprite   0, 0,  -1, 0, $01, $00
+	dsprite   0, 0,   0, 0, $05, $00
+
+.OAMData_9b
+	dsprite  -4, 4,   1, 0, $00, $00
+	dsprite  -4, 4,   2, 0, $01, $00
+	dsprite  -3, 4,  -1, 0, $02, $00
+	dsprite  -3, 4,   0, 0, $03, $00
+	dsprite  -3, 4,   1, 0, $04, $00
+	dsprite  -3, 4,   2, 0, $05, $00
+	dsprite  -3, 4,   3, 0, $06, $00
+	dsprite  -2, 4,  -2, 0, $07, $00
+	dsprite  -2, 4,  -1, 0, $08, $00
+	dsprite  -2, 4,   0, 0, $09, $00
+	dsprite  -2, 4,   1, 0, $0a, $00
+	dsprite  -2, 4,   2, 0, $0b, $00
+	dsprite  -2, 4,   3, 0, $0c, $00
+	dsprite  -2, 4,   4, 0, $0d, $00
+	dsprite  -1, 4,  -3, 0, $0e, $00
+	dsprite  -1, 4,  -2, 0, $0f, $00
+	dsprite  -1, 4,  -1, 0, $10, $00
+	dsprite  -1, 4,   0, 0, $11, $00
+	dsprite  -1, 4,   1, 0, $12, $00
+	dsprite  -1, 4,   2, 0, $13, $00
+	dsprite   0, 4,  -5, 0, $14, $00
+	dsprite   0, 4,  -4, 0, $15, $00
+	dsprite   0, 4,  -3, 0, $16, $00
+	dsprite   0, 4,  -2, 0, $17, $00
+	dsprite   0, 4,  -1, 0, $18, $00
+	dsprite   0, 4,   0, 0, $19, $00
+	dsprite   0, 4,   1, 0, $1a, $00
+	dsprite   0, 4,   2, 0, $1b, $00
+	dsprite   0, 4,   3, 0, $1c, $00
+	dsprite   1, 4,  -5, 0, $1d, $00
+	dsprite   1, 4,  -4, 0, $1e, $00
+	dsprite   1, 4,  -2, 0, $1f, $00
+	dsprite   1, 4,  -1, 0, $20, $00
+	dsprite   1, 4,   0, 0, $21, $00
+	dsprite   1, 4,   1, 0, $22, $00
+	dsprite   2, 4,   0, 0, $23, $00
+
+.OAMData_9c
+	dsprite   0, 4,  -1, 0, $02, $00
+	dsprite   0, 4,   0, 0, $03, $00
+	dsprite  -1, 4,  -1, 0, $01, $00
+	dsprite  -1, 4,   0, 0, $01, $20
+	dsprite  -2, 4,  -1, 0, $00, $00
+	dsprite  -2, 4,   0, 0, $00, $20
+
+.OAMData_9f
+	dsprite  -1, 0,  -2, 0, $00, $00
+	dsprite  -1, 0,  -1, 0, $01, $00
+	dsprite  -1, 0,   0, 0, $02, $00
+	dsprite  -1, 0,   1, 0, $03, $00
+	dsprite   0, 0,  -2, 0, $04, $00
+	dsprite   0, 0,  -1, 0, $05, $00
+	dsprite   0, 0,   0, 0, $06, $00
+	dsprite   0, 0,   1, 0, $07, $00
+
+.OAMData_a0
+	dsprite  -2, 4,  -1, 4, $00, $00
+	dsprite  -1, 4,  -1, 4, $00, $00
+	dsprite   0, 4,  -1, 4, $00, $00
+	dsprite  -3, 4,  -1, 4, $00, $00
+	dsprite   1, 4,  -1, 4, $00, $00
+	dsprite  -4, 4,  -1, 4, $00, $00
+	dsprite   2, 4,  -1, 4, $00, $00
+
+.OAMData_a4
+	dsprite  -2, 4,  -2, 4, $00, $00
+	dsprite  -2, 4,  -1, 4, $01, $00
+	dsprite  -2, 4,   0, 4, $02, $00
+	dsprite  -1, 4,  -2, 4, $03, $00
+	dsprite  -1, 4,  -1, 4, $04, $00
+	dsprite  -1, 4,   0, 4, $05, $00
+	dsprite   0, 4,  -2, 4, $00, $40
+	dsprite   0, 4,  -1, 4, $01, $40
+	dsprite   0, 4,   0, 4, $02, $40
+
+.OAMData_ac
+	dsprite  -1, 4,  -2, 0, $00, $00
+	dsprite  -1, 4,  -1, 0, $01, $00
+	dsprite  -1, 4,   0, 0, $01, $20
+	dsprite  -1, 4,   1, 0, $00, $20
+
+.OAMData_bc
+	dsprite  -1, 4,  -3, 0, $00, $00
+	dsprite  -1, 4,  -2, 0, $01, $00
+	dsprite  -1, 4,  -1, 0, $02, $00
+	dsprite  -1, 4,   0, 0, $02, $20
+	dsprite  -1, 4,   1, 0, $01, $20
+	dsprite  -1, 4,   2, 0, $00, $20
+
+.OAMData_c1
+	dsprite  -2, 0,  -2, 0, $00, $00
+	dsprite  -2, 0,  -1, 0, $01, $00
+	dsprite  -2, 0,   0, 0, $02, $00
+	dsprite  -2, 0,   1, 0, $00, $20
+	dsprite  -1, 0,  -2, 0, $03, $00
+	dsprite  -1, 0,  -1, 0, $04, $00
+	dsprite  -1, 0,   0, 0, $04, $20
+	dsprite  -1, 0,   1, 0, $05, $00
+	dsprite   0, 0,  -2, 0, $05, $60
+	dsprite   0, 0,  -1, 0, $04, $40
+	dsprite   0, 0,   0, 0, $04, $60
+	dsprite   0, 0,   1, 0, $03, $60
+	dsprite   1, 0,  -2, 0, $00, $40
+	dsprite   1, 0,  -1, 0, $02, $60
+	dsprite   1, 0,   0, 0, $01, $60
+	dsprite   1, 0,   1, 0, $00, $60
+
+.OAMData_c2
+	dsprite  -1, 0,  -2, 0, $00, $00
+	dsprite  -1, 0,  -1, 0, $01, $00
+	dsprite  -1, 0,   0, 0, $00, $60
+	dsprite   0, 0,  -1, 0, $00, $00
+	dsprite   0, 0,   0, 0, $01, $00
+	dsprite   0, 0,   1, 0, $00, $60
+
+.OAMData_c8
+	dsprite  -1, 0,   1, 4, $00, $00
+	dsprite  -1, 0,   2, 4, $01, $00
+	dsprite   0, 0,  -1, 4, $02, $00
+	dsprite   0, 0,   0, 4, $03, $00
+	dsprite   0, 0,   1, 4, $04, $00
+	dsprite   0, 0,   2, 4, $05, $00
+
+.OAMData_ca
+	dsprite  -1, 0,  -1, 0, $00, $00
+	dsprite  -1, 0,   0, 0, $01, $60
+	dsprite   0, 0,  -1, 0, $01, $00
+	dsprite   0, 0,   0, 0, $01, $20
+
+.OAMData_cc
+	dsprite  -2, 0, -13, 4, $00, $00
+	dsprite  -4, 0, -11, 4, $00, $00
+	dsprite  -1, 0,  -9, 4, $00, $00
+	dsprite  -5, 0,  -7, 4, $00, $00
+	dsprite  -3, 0,  -5, 4, $00, $00
+	dsprite  -5, 0,  -3, 4, $00, $00
+	dsprite  -3, 0,  -1, 4, $00, $00
+	dsprite  -3, 0,   0, 4, $00, $00
+	dsprite  -5, 0,   2, 4, $00, $00
+	dsprite   0, 0,   4, 4, $00, $00
+	dsprite  -2, 0,   6, 4, $00, $00
+	dsprite  -4, 0,   8, 4, $00, $00
+	dsprite  -2, 0,  10, 4, $00, $00
+; cfcf6
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -297,7 +297,410 @@
     const BATTLEANIMFUNC_4E
     const BATTLEANIMFUNC_4F
 
+	const_def
+	const BATTLEANIMFRAMESET_00
+    const BATTLEANIMFRAMESET_01
+    const BATTLEANIMFRAMESET_02
+    const BATTLEANIMFRAMESET_03
+    const BATTLEANIMFRAMESET_04
+    const BATTLEANIMFRAMESET_05
+    const BATTLEANIMFRAMESET_06
+    const BATTLEANIMFRAMESET_07
+    const BATTLEANIMFRAMESET_08
+    const BATTLEANIMFRAMESET_09
+    const BATTLEANIMFRAMESET_0A
+    const BATTLEANIMFRAMESET_0B
+    const BATTLEANIMFRAMESET_0C
+    const BATTLEANIMFRAMESET_0D
+    const BATTLEANIMFRAMESET_0E
+    const BATTLEANIMFRAMESET_0F
+    const BATTLEANIMFRAMESET_10
+    const BATTLEANIMFRAMESET_11
+    const BATTLEANIMFRAMESET_12
+    const BATTLEANIMFRAMESET_13
+    const BATTLEANIMFRAMESET_14
+    const BATTLEANIMFRAMESET_15
+    const BATTLEANIMFRAMESET_16
+    const BATTLEANIMFRAMESET_17
+    const BATTLEANIMFRAMESET_18
+    const BATTLEANIMFRAMESET_19
+    const BATTLEANIMFRAMESET_1A
+    const BATTLEANIMFRAMESET_1B
+    const BATTLEANIMFRAMESET_1C
+    const BATTLEANIMFRAMESET_1D
+    const BATTLEANIMFRAMESET_1E
+    const BATTLEANIMFRAMESET_1F
+    const BATTLEANIMFRAMESET_20
+    const BATTLEANIMFRAMESET_21
+    const BATTLEANIMFRAMESET_22
+    const BATTLEANIMFRAMESET_23
+    const BATTLEANIMFRAMESET_24
+    const BATTLEANIMFRAMESET_25
+    const BATTLEANIMFRAMESET_26
+    const BATTLEANIMFRAMESET_27
+    const BATTLEANIMFRAMESET_28
+    const BATTLEANIMFRAMESET_29
+    const BATTLEANIMFRAMESET_2A
+    const BATTLEANIMFRAMESET_2B
+    const BATTLEANIMFRAMESET_2C
+    const BATTLEANIMFRAMESET_2D
+    const BATTLEANIMFRAMESET_2E
+    const BATTLEANIMFRAMESET_2F
+    const BATTLEANIMFRAMESET_30
+    const BATTLEANIMFRAMESET_31
+    const BATTLEANIMFRAMESET_32
+    const BATTLEANIMFRAMESET_33
+    const BATTLEANIMFRAMESET_34
+    const BATTLEANIMFRAMESET_35
+    const BATTLEANIMFRAMESET_36
+    const BATTLEANIMFRAMESET_37
+    const BATTLEANIMFRAMESET_38
+    const BATTLEANIMFRAMESET_39
+    const BATTLEANIMFRAMESET_3A
+    const BATTLEANIMFRAMESET_3B
+    const BATTLEANIMFRAMESET_3C
+    const BATTLEANIMFRAMESET_3D
+    const BATTLEANIMFRAMESET_3E
+    const BATTLEANIMFRAMESET_3F
+    const BATTLEANIMFRAMESET_40
+    const BATTLEANIMFRAMESET_41
+    const BATTLEANIMFRAMESET_42
+    const BATTLEANIMFRAMESET_43
+    const BATTLEANIMFRAMESET_44
+    const BATTLEANIMFRAMESET_45
+    const BATTLEANIMFRAMESET_46
+    const BATTLEANIMFRAMESET_47
+    const BATTLEANIMFRAMESET_48
+    const BATTLEANIMFRAMESET_49
+    const BATTLEANIMFRAMESET_4A
+    const BATTLEANIMFRAMESET_4B
+    const BATTLEANIMFRAMESET_4C
+    const BATTLEANIMFRAMESET_4D
+    const BATTLEANIMFRAMESET_4E
+    const BATTLEANIMFRAMESET_4F
+    const BATTLEANIMFRAMESET_50
+    const BATTLEANIMFRAMESET_51
+    const BATTLEANIMFRAMESET_52
+    const BATTLEANIMFRAMESET_53
+    const BATTLEANIMFRAMESET_54
+    const BATTLEANIMFRAMESET_55
+    const BATTLEANIMFRAMESET_56
+    const BATTLEANIMFRAMESET_57
+    const BATTLEANIMFRAMESET_58
+    const BATTLEANIMFRAMESET_59
+    const BATTLEANIMFRAMESET_5A
+    const BATTLEANIMFRAMESET_5B
+    const BATTLEANIMFRAMESET_5C
+    const BATTLEANIMFRAMESET_5D
+    const BATTLEANIMFRAMESET_5E
+    const BATTLEANIMFRAMESET_5F
+    const BATTLEANIMFRAMESET_60
+    const BATTLEANIMFRAMESET_61
+    const BATTLEANIMFRAMESET_62
+    const BATTLEANIMFRAMESET_63
+    const BATTLEANIMFRAMESET_64
+    const BATTLEANIMFRAMESET_65
+    const BATTLEANIMFRAMESET_66
+    const BATTLEANIMFRAMESET_67
+    const BATTLEANIMFRAMESET_68
+    const BATTLEANIMFRAMESET_69
+    const BATTLEANIMFRAMESET_6A
+    const BATTLEANIMFRAMESET_6B
+    const BATTLEANIMFRAMESET_6C
+    const BATTLEANIMFRAMESET_6D
+    const BATTLEANIMFRAMESET_6E
+    const BATTLEANIMFRAMESET_6F
+    const BATTLEANIMFRAMESET_70
+    const BATTLEANIMFRAMESET_71
+    const BATTLEANIMFRAMESET_72
+    const BATTLEANIMFRAMESET_73
+    const BATTLEANIMFRAMESET_74
+    const BATTLEANIMFRAMESET_75
+    const BATTLEANIMFRAMESET_76
+    const BATTLEANIMFRAMESET_77
+    const BATTLEANIMFRAMESET_78
+    const BATTLEANIMFRAMESET_79
+    const BATTLEANIMFRAMESET_7A
+    const BATTLEANIMFRAMESET_7B
+    const BATTLEANIMFRAMESET_7C
+    const BATTLEANIMFRAMESET_7D
+    const BATTLEANIMFRAMESET_7E
+    const BATTLEANIMFRAMESET_7F
+    const BATTLEANIMFRAMESET_80
+    const BATTLEANIMFRAMESET_81
+    const BATTLEANIMFRAMESET_82
+    const BATTLEANIMFRAMESET_83
+    const BATTLEANIMFRAMESET_84
+    const BATTLEANIMFRAMESET_85
+    const BATTLEANIMFRAMESET_86
+    const BATTLEANIMFRAMESET_87
+    const BATTLEANIMFRAMESET_88
+    const BATTLEANIMFRAMESET_89
+    const BATTLEANIMFRAMESET_8A
+    const BATTLEANIMFRAMESET_8B
+    const BATTLEANIMFRAMESET_8C
+    const BATTLEANIMFRAMESET_8D
+    const BATTLEANIMFRAMESET_8E
+    const BATTLEANIMFRAMESET_8F
+    const BATTLEANIMFRAMESET_90
+    const BATTLEANIMFRAMESET_91
+    const BATTLEANIMFRAMESET_92
+    const BATTLEANIMFRAMESET_93
+    const BATTLEANIMFRAMESET_94
+    const BATTLEANIMFRAMESET_95
+    const BATTLEANIMFRAMESET_96
+    const BATTLEANIMFRAMESET_97
+    const BATTLEANIMFRAMESET_98
+    const BATTLEANIMFRAMESET_99
+    const BATTLEANIMFRAMESET_9A
+    const BATTLEANIMFRAMESET_9B
+    const BATTLEANIMFRAMESET_9C
+    const BATTLEANIMFRAMESET_9D
+    const BATTLEANIMFRAMESET_9E
+    const BATTLEANIMFRAMESET_9F
+    const BATTLEANIMFRAMESET_A0
+    const BATTLEANIMFRAMESET_A1
+    const BATTLEANIMFRAMESET_A2
+    const BATTLEANIMFRAMESET_A3
+    const BATTLEANIMFRAMESET_A4
+    const BATTLEANIMFRAMESET_A5
+    const BATTLEANIMFRAMESET_A6
+    const BATTLEANIMFRAMESET_A7
+    const BATTLEANIMFRAMESET_A8
+    const BATTLEANIMFRAMESET_A9
+    const BATTLEANIMFRAMESET_AA
+    const BATTLEANIMFRAMESET_AB
+    const BATTLEANIMFRAMESET_AC
+    const BATTLEANIMFRAMESET_AD
+    const BATTLEANIMFRAMESET_AE
+    const BATTLEANIMFRAMESET_AF
+    const BATTLEANIMFRAMESET_B0
+    const BATTLEANIMFRAMESET_B1
+    const BATTLEANIMFRAMESET_B2
+    const BATTLEANIMFRAMESET_B3
+    const BATTLEANIMFRAMESET_B4
+    const BATTLEANIMFRAMESET_B5
+    const BATTLEANIMFRAMESET_B6
+    const BATTLEANIMFRAMESET_B7
+    const BATTLEANIMFRAMESET_B8
 
+	const_def
+	const BATTLEANIMOAMSET_00
+	const BATTLEANIMOAMSET_01
+	const BATTLEANIMOAMSET_02
+	const BATTLEANIMOAMSET_03
+	const BATTLEANIMOAMSET_04
+	const BATTLEANIMOAMSET_05
+	const BATTLEANIMOAMSET_06
+	const BATTLEANIMOAMSET_07
+	const BATTLEANIMOAMSET_08
+	const BATTLEANIMOAMSET_09
+	const BATTLEANIMOAMSET_0A
+	const BATTLEANIMOAMSET_0B
+	const BATTLEANIMOAMSET_0C
+	const BATTLEANIMOAMSET_0D
+	const BATTLEANIMOAMSET_0E
+	const BATTLEANIMOAMSET_0F
+	const BATTLEANIMOAMSET_10
+	const BATTLEANIMOAMSET_11
+	const BATTLEANIMOAMSET_12
+	const BATTLEANIMOAMSET_13
+	const BATTLEANIMOAMSET_14
+	const BATTLEANIMOAMSET_15
+	const BATTLEANIMOAMSET_16
+	const BATTLEANIMOAMSET_17
+	const BATTLEANIMOAMSET_18
+	const BATTLEANIMOAMSET_19
+	const BATTLEANIMOAMSET_1A
+	const BATTLEANIMOAMSET_1B
+	const BATTLEANIMOAMSET_1C
+	const BATTLEANIMOAMSET_1D
+	const BATTLEANIMOAMSET_1E
+	const BATTLEANIMOAMSET_1F
+	const BATTLEANIMOAMSET_20
+	const BATTLEANIMOAMSET_21
+	const BATTLEANIMOAMSET_22
+	const BATTLEANIMOAMSET_23
+	const BATTLEANIMOAMSET_24
+	const BATTLEANIMOAMSET_25
+	const BATTLEANIMOAMSET_26
+	const BATTLEANIMOAMSET_27
+	const BATTLEANIMOAMSET_28
+	const BATTLEANIMOAMSET_29
+	const BATTLEANIMOAMSET_2A
+	const BATTLEANIMOAMSET_2B
+	const BATTLEANIMOAMSET_2C
+	const BATTLEANIMOAMSET_2D
+	const BATTLEANIMOAMSET_2E
+	const BATTLEANIMOAMSET_2F
+	const BATTLEANIMOAMSET_30
+	const BATTLEANIMOAMSET_31
+	const BATTLEANIMOAMSET_32
+	const BATTLEANIMOAMSET_33
+	const BATTLEANIMOAMSET_34
+	const BATTLEANIMOAMSET_35
+	const BATTLEANIMOAMSET_36
+	const BATTLEANIMOAMSET_37
+	const BATTLEANIMOAMSET_38
+	const BATTLEANIMOAMSET_39
+	const BATTLEANIMOAMSET_3A
+	const BATTLEANIMOAMSET_3B
+	const BATTLEANIMOAMSET_3C
+	const BATTLEANIMOAMSET_3D
+	const BATTLEANIMOAMSET_3E
+	const BATTLEANIMOAMSET_3F
+	const BATTLEANIMOAMSET_40
+	const BATTLEANIMOAMSET_41
+	const BATTLEANIMOAMSET_42
+	const BATTLEANIMOAMSET_43
+	const BATTLEANIMOAMSET_44
+	const BATTLEANIMOAMSET_45
+	const BATTLEANIMOAMSET_46
+	const BATTLEANIMOAMSET_47
+	const BATTLEANIMOAMSET_48
+	const BATTLEANIMOAMSET_49
+	const BATTLEANIMOAMSET_4A
+	const BATTLEANIMOAMSET_4B
+	const BATTLEANIMOAMSET_4C
+	const BATTLEANIMOAMSET_4D
+	const BATTLEANIMOAMSET_4E
+	const BATTLEANIMOAMSET_4F
+	const BATTLEANIMOAMSET_50
+	const BATTLEANIMOAMSET_51
+	const BATTLEANIMOAMSET_52
+	const BATTLEANIMOAMSET_53
+	const BATTLEANIMOAMSET_54
+	const BATTLEANIMOAMSET_55
+	const BATTLEANIMOAMSET_56
+	const BATTLEANIMOAMSET_57
+	const BATTLEANIMOAMSET_58
+	const BATTLEANIMOAMSET_59
+	const BATTLEANIMOAMSET_5A
+	const BATTLEANIMOAMSET_5B
+	const BATTLEANIMOAMSET_5C
+	const BATTLEANIMOAMSET_5D
+	const BATTLEANIMOAMSET_5E
+	const BATTLEANIMOAMSET_5F
+	const BATTLEANIMOAMSET_60
+	const BATTLEANIMOAMSET_61
+	const BATTLEANIMOAMSET_62
+	const BATTLEANIMOAMSET_63
+	const BATTLEANIMOAMSET_64
+	const BATTLEANIMOAMSET_65
+	const BATTLEANIMOAMSET_66
+	const BATTLEANIMOAMSET_67
+	const BATTLEANIMOAMSET_68
+	const BATTLEANIMOAMSET_69
+	const BATTLEANIMOAMSET_6A
+	const BATTLEANIMOAMSET_6B
+	const BATTLEANIMOAMSET_6C
+	const BATTLEANIMOAMSET_6D
+	const BATTLEANIMOAMSET_6E
+	const BATTLEANIMOAMSET_6F
+	const BATTLEANIMOAMSET_70
+	const BATTLEANIMOAMSET_71
+	const BATTLEANIMOAMSET_72
+	const BATTLEANIMOAMSET_73
+	const BATTLEANIMOAMSET_74
+	const BATTLEANIMOAMSET_75
+	const BATTLEANIMOAMSET_76
+	const BATTLEANIMOAMSET_77
+	const BATTLEANIMOAMSET_78
+	const BATTLEANIMOAMSET_79
+	const BATTLEANIMOAMSET_7A
+	const BATTLEANIMOAMSET_7B
+	const BATTLEANIMOAMSET_7C
+	const BATTLEANIMOAMSET_7D
+	const BATTLEANIMOAMSET_7E
+	const BATTLEANIMOAMSET_7F
+	const BATTLEANIMOAMSET_80
+	const BATTLEANIMOAMSET_81
+	const BATTLEANIMOAMSET_82
+	const BATTLEANIMOAMSET_83
+	const BATTLEANIMOAMSET_84
+	const BATTLEANIMOAMSET_85
+	const BATTLEANIMOAMSET_86
+	const BATTLEANIMOAMSET_87
+	const BATTLEANIMOAMSET_88
+	const BATTLEANIMOAMSET_89
+	const BATTLEANIMOAMSET_8A
+	const BATTLEANIMOAMSET_8B
+	const BATTLEANIMOAMSET_8C
+	const BATTLEANIMOAMSET_8D
+	const BATTLEANIMOAMSET_8E
+	const BATTLEANIMOAMSET_8F
+	const BATTLEANIMOAMSET_90
+	const BATTLEANIMOAMSET_91
+	const BATTLEANIMOAMSET_92
+	const BATTLEANIMOAMSET_93
+	const BATTLEANIMOAMSET_94
+	const BATTLEANIMOAMSET_95
+	const BATTLEANIMOAMSET_96
+	const BATTLEANIMOAMSET_97
+	const BATTLEANIMOAMSET_98
+	const BATTLEANIMOAMSET_99
+	const BATTLEANIMOAMSET_9A
+	const BATTLEANIMOAMSET_9B
+	const BATTLEANIMOAMSET_9C
+	const BATTLEANIMOAMSET_9D
+	const BATTLEANIMOAMSET_9E
+	const BATTLEANIMOAMSET_9F
+	const BATTLEANIMOAMSET_A0
+	const BATTLEANIMOAMSET_A1
+	const BATTLEANIMOAMSET_A2
+	const BATTLEANIMOAMSET_A3
+	const BATTLEANIMOAMSET_A4
+	const BATTLEANIMOAMSET_A5
+	const BATTLEANIMOAMSET_A6
+	const BATTLEANIMOAMSET_A7
+	const BATTLEANIMOAMSET_A8
+	const BATTLEANIMOAMSET_A9
+	const BATTLEANIMOAMSET_AA
+	const BATTLEANIMOAMSET_AB
+	const BATTLEANIMOAMSET_AC
+	const BATTLEANIMOAMSET_AD
+	const BATTLEANIMOAMSET_AE
+	const BATTLEANIMOAMSET_AF
+	const BATTLEANIMOAMSET_B0
+	const BATTLEANIMOAMSET_B1
+	const BATTLEANIMOAMSET_B2
+	const BATTLEANIMOAMSET_B3
+	const BATTLEANIMOAMSET_B4
+	const BATTLEANIMOAMSET_B5
+	const BATTLEANIMOAMSET_B6
+	const BATTLEANIMOAMSET_B7
+	const BATTLEANIMOAMSET_B8
+	const BATTLEANIMOAMSET_B9
+	const BATTLEANIMOAMSET_BA
+	const BATTLEANIMOAMSET_BB
+	const BATTLEANIMOAMSET_BC
+	const BATTLEANIMOAMSET_BD
+	const BATTLEANIMOAMSET_BE
+	const BATTLEANIMOAMSET_BF
+	const BATTLEANIMOAMSET_C0
+	const BATTLEANIMOAMSET_C1
+	const BATTLEANIMOAMSET_C2
+	const BATTLEANIMOAMSET_C3
+	const BATTLEANIMOAMSET_C4
+	const BATTLEANIMOAMSET_C5
+	const BATTLEANIMOAMSET_C6
+	const BATTLEANIMOAMSET_C7
+	const BATTLEANIMOAMSET_C8
+	const BATTLEANIMOAMSET_C9
+	const BATTLEANIMOAMSET_CA
+	const BATTLEANIMOAMSET_CB
+	const BATTLEANIMOAMSET_CC
+	const BATTLEANIMOAMSET_CD
+	const BATTLEANIMOAMSET_CE
+	const BATTLEANIMOAMSET_CF
+	const BATTLEANIMOAMSET_D0
+	const BATTLEANIMOAMSET_D1
+	const BATTLEANIMOAMSET_D2
+	const BATTLEANIMOAMSET_D3
+	const BATTLEANIMOAMSET_D4
+	const BATTLEANIMOAMSET_D5
+	const BATTLEANIMOAMSET_D6
+	const BATTLEANIMOAMSET_D7
 
 const_value SET 1
 	const ANIM_BG_FLASH_INVERTED
@@ -333,8 +736,8 @@
 	const ANIM_BG_1F
 	const ANIM_BG_20
 	const ANIM_BG_21
-	const ANIM_BG_22
-	const ANIM_BG_23
+	const ANIM_BG_BOUNCE_DOWN
+	const ANIM_BG_DIG
 	const ANIM_BG_TACKLE
 	const ANIM_BG_25
 	const ANIM_BG_26
@@ -368,5 +771,5 @@
 	const_def
 	const BG_EFFECT_STRUCT_FUNCTION
 	const BG_EFFECT_STRUCT_JT_INDEX
-	const BG_EFFECT_STRUCT_02
+	const BG_EFFECT_STRUCT_BATTLE_TURN
 	const BG_EFFECT_STRUCT_03
--- a/data/sprite_engine.asm
+++ b/data/sprite_engine.asm
@@ -1,536 +1,660 @@
 SpriteAnimFrameData: ; 8d6e6
-	dw Unknown_8d76a ; 00
-	dw Unknown_8d76d ; 01
-	dw Unknown_8d772 ; 02
-	dw Unknown_8d777 ; 03
-	dw Unknown_8d77c ; 04
-	dw Unknown_8d781 ; 05
-	dw Unknown_8d786 ; 06
-	dw Unknown_8d7a6 ; 07
-	dw Unknown_8d7ab ; 08
-	dw Unknown_8d7b0 ; 09
-	dw Unknown_8d7b5 ; 0a
-	dw Unknown_8d7d4 ; 0b
-	dw Unknown_8d7d9 ; 0c
-	dw Unknown_8d7e2 ; 0d
-	dw Unknown_8d7eb ; 0e
-	dw Unknown_8d7f4 ; 0f
-	dw Unknown_8d7ff ; 10
-	dw Unknown_8d78b ; 11
-	dw Unknown_8d802 ; 12
-	dw Unknown_8d805 ; 13
-	dw Unknown_8d808 ; 14
-	dw Unknown_8d811 ; 15
-	dw Unknown_8d818 ; 16
-	dw Unknown_8d81d ; 17
-	dw Unknown_8d822 ; 18
-	dw Unknown_8d825 ; 19
-	dw Unknown_8d82c ; 1a
-	dw Unknown_8d82f ; 1b
-	dw Unknown_8d861 ; 1c
-	dw Unknown_8d864 ; 1d
-	dw Unknown_8d867 ; 1e
-	dw Unknown_8d874 ; 1f
-	dw Unknown_8d877 ; 20
-	dw Unknown_8d87a ; 21
-	dw Unknown_8d87d ; 22
-	dw Unknown_8d880 ; 23
-	dw Unknown_8d883 ; 24
-	dw Unknown_8d890 ; 25 headbutt
-	dw Unknown_8d899 ; 26
-	dw Unknown_8d89c ; 27
-	dw Unknown_8d89f ; 28
-	dw Unknown_8d8a2 ; 29
-	dw Unknown_8d8a5 ; 2a
-	dw Unknown_8d8a8 ; 2b
-	dw Unknown_8d8ab ; 2c
-	dw Unknown_8d794 ; 2d
-	dw Unknown_8d79d ; 2e
-	dw Unknown_8d8ae ; 2f
-	dw Unknown_8d8cd ; 30
-	dw Unknown_8d8ec ; 31
-	dw Unknown_8d8f1 ; 32
-	dw Unknown_8d8f4 ; 33
-	dw Unknown_8d8f7 ; 34
-	dw Unknown_8d8fe ; 35
-	dw Unknown_8d907 ; 36
-	dw Unknown_8d90c ; 37
-	dw Unknown_8d913 ; 38
-	dw Unknown_8d916 ; 39 unown in intro
-	dw Unknown_8d91d ; 3a unown in intro
-	dw Unknown_8d924 ; 3b unown in intro
-	dw Unknown_8d92b ; 3c unown in intro
-	dw Unknown_8d932 ; 3d
-	dw Unknown_8d93d ; 3e
-	dw Unknown_8d940 ; 3f
-	dw Unknown_8d943 ; 40 celebi on the left
-	dw Unknown_8d948 ; 41 celebi on the right
+	dw .Frameset_00 ; 00
+	dw .Frameset_01 ; 01
+	dw .Frameset_02 ; 02
+	dw .Frameset_03 ; 03
+	dw .Frameset_04 ; 04
+	dw .Frameset_05 ; 05
+	dw .Frameset_06 ; 06
+	dw .Frameset_07 ; 07
+	dw .Frameset_08 ; 08
+	dw .Frameset_09 ; 09
+	dw .Frameset_0a ; 0a
+	dw .Frameset_0b ; 0b
+	dw .Frameset_0c ; 0c
+	dw .Frameset_0d ; 0d
+	dw .Frameset_0e ; 0e
+	dw .Frameset_0f ; 0f
+	dw .Frameset_10 ; 10
+	dw .Frameset_11 ; 11
+	dw .Frameset_12 ; 12
+	dw .Frameset_13 ; 13
+	dw .Frameset_14 ; 14
+	dw .Frameset_15 ; 15
+	dw .Frameset_16 ; 16
+	dw .Frameset_17 ; 17
+	dw .Frameset_18 ; 18
+	dw .Frameset_19 ; 19
+	dw .Frameset_1a ; 1a
+	dw .Frameset_1b ; 1b
+	dw .Frameset_1c ; 1c
+	dw .Frameset_1d ; 1d
+	dw .Frameset_1e ; 1e
+	dw .Frameset_1f ; 1f
+	dw .Frameset_20 ; 20
+	dw .Frameset_21 ; 21
+	dw .Frameset_22 ; 22
+	dw .Frameset_23 ; 23
+	dw .Frameset_24 ; 24
+	dw .Frameset_25 ; 25 headbutt
+	dw .Frameset_26 ; 26
+	dw .Frameset_27 ; 27
+	dw .Frameset_28 ; 28
+	dw .Frameset_29 ; 29
+	dw .Frameset_2a ; 2a
+	dw .Frameset_2b ; 2b
+	dw .Frameset_2c ; 2c
+	dw .Frameset_2d ; 2d
+	dw .Frameset_2e ; 2e
+	dw .Frameset_2f ; 2f
+	dw .Frameset_30 ; 30
+	dw .Frameset_31 ; 31
+	dw .Frameset_32 ; 32
+	dw .Frameset_33 ; 33
+	dw .Frameset_34 ; 34
+	dw .Frameset_35 ; 35
+	dw .Frameset_36 ; 36
+	dw .Frameset_37 ; 37
+	dw .Frameset_38 ; 38
+	dw .Frameset_39 ; 39 unown in intro
+	dw .Frameset_3a ; 3a unown in intro
+	dw .Frameset_3b ; 3b unown in intro
+	dw .Frameset_3c ; 3c unown in intro
+	dw .Frameset_3d ; 3d
+	dw .Frameset_3e ; 3e
+	dw .Frameset_3f ; 3f
+	dw .Frameset_40 ; 40 celebi on the left
+	dw .Frameset_41 ; 41 celebi on the right
 ; 8d76a
 				; OAM idx (see SpriteAnimOAMData), flip flags/duration
-Unknown_8d76a: 	db $00, $20
-                db  -1
-Unknown_8d76d: 	db $00, $08
-                db $01, $08
-                db  -2
-Unknown_8d772: 	db $3d, $08
-                db $3e, $08
-                db  -2
-Unknown_8d777: 	db $3f, $08
-                db $40, $08
-                db  -2
-Unknown_8d77c: 	db $00, $04
-                db $01, $04
-                db  -2
-Unknown_8d781: 	db $3d, $04
-                db $3e, $04
-                db  -2
-Unknown_8d786: 	db $3f, $04
-                db $40, $04
-                db  -2
-Unknown_8d78b: 	db $00, $08
-                db $01, $08
-                db $00, $08
-                db $01, $48
-                db  -2
-Unknown_8d794: 	db $63, $08
-                db $64, $08
-                db $63, $08
-                db $64, $48
-                db  -2
-Unknown_8d79d: 	db $65, $08
-                db $66, $08
-                db $65, $08
-                db $66, $48
-                db  -2
-Unknown_8d7a6: 	db $1e, $01
-                db $1f, $01
-                db  -2
-Unknown_8d7ab: 	db $20, $01
-                db  -3, $01
-                db  -2
-Unknown_8d7b0: 	db $21, $01
-                db  -3, $01
-                db  -2
-Unknown_8d7b5: 	db $81, $0c
-                db $82, $01
-                db $83, $01
-                db $82, $04
-                db $81, $0c
-                db $82, $0c
-                db $83, $04
-                db $84, $20
-                db $85, $03
-                db $86, $03
-                db $87, $04
-                db $88, $04
-                db $89, $04
-                db $8a, $0a
-                db $8b, $07
-                db  -1
-Unknown_8d7d4: 	db $23, $03
-                db $23, $83
-                db  -2
-Unknown_8d7d9: 	db $24, $02
-                db $25, $02
-                db $26, $02
-                db $25, $02
-                db  -2
-Unknown_8d7e2: 	db $27, $07
-                db $28, $07
-                db $27, $87
-                db $28, $47
-                db  -2
-Unknown_8d7eb: 	db $29, $07
-                db $2a, $07
-                db $29, $07
-                db $2b, $07
-                db  -2
-Unknown_8d7f4: 	db $29, $07
-                db $2c, $07
-                db $2d, $07
-                db $2c, $07
-                db $29, $07
-                db  -1
-Unknown_8d7ff: 	db $2e, $14
-                db  -1
-Unknown_8d802: 	db $2f, $20
-                db  -1
-Unknown_8d805: 	db $30, $20
-                db  -1
-Unknown_8d808: 	db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db  -2
-Unknown_8d811: 	db $32, $04
-                db $33, $04
-                db $34, $04
-                db  -4
-Unknown_8d818: 	db $35, $03
-                db $36, $03
-                db  -2
-Unknown_8d81d: 	db $37, $07
-                db $38, $07
-                db  -2
-Unknown_8d822: 	db $39, $20
-                db  -1
-Unknown_8d825: 	db $3b, $02
-                db $3a, $02
-                db $3b, $02
-                db  -1
-Unknown_8d82c: 	db $3c, $20
-                db  -1
-Unknown_8d82f: 	db $41, $08
-                db $42, $08
-                db $41, $08
-                db $42, $48
-                db  -2
-                db $43, $08
-                db $44, $08
-                db  -2
-                db $45, $08
-                db $46, $08
-                db  -2
-                db $47, $08
-                db $48, $08
-                db  -2
-                db $49, $01
-                db $49, $41
-                db $49, $c1
-                db $49, $81
-                db  -2
-                db $4a, $20
-                db  -1
-                db $4b, $20
-                db  -1
-                db $4c, $20
-                db  -1
-                db $4d, $20
-                db  -1
-                db $4e, $03
-                db  -3, $03
-                db  -2
-Unknown_8d861: 	db  -3, $20
-                db  -1
-Unknown_8d864: 	db $4f, $20
-                db  -1
-Unknown_8d867: 	db $50, $02
-                db $51, $10
-                db  -3, $01
-                db $52, $01
-                db  -3, $01
-                db $53, $01
-                db  -4
-Unknown_8d874: 	db $54, $20
-                db  -1
-Unknown_8d877: 	db $55, $20
-                db  -1
-Unknown_8d87a: 	db $55, $60
-                db  -1
-Unknown_8d87d: 	db $55, $a0
-                db  -1
-Unknown_8d880: 	db $55, $e0
-                db  -1
-Unknown_8d883: 	db $56, $0a
-                db $57, $09
-                db $58, $0a
-                db $59, $0a
-                db $58, $09
-                db $5a, $0a
-                db  -2
-Unknown_8d890: 	db $50, $02
-                db $5b, $02
-                db $50, $02
-                db $5b, $42
-                db  -2
-Unknown_8d899: 	db $5c, $02
-                db  -1
-Unknown_8d89c: 	db $5d, $02
-                db  -1
-Unknown_8d89f: 	db $5e, $02
-                db  -1
-Unknown_8d8a2: 	db $5f, $02
-                db  -1
-Unknown_8d8a5: 	db $60, $02
-                db  -1
-Unknown_8d8a8: 	db $61, $02
-                db  -1
-Unknown_8d8ab: 	db $62, $02
-                db  -1
-Unknown_8d8ae: 	db $32, $03
-                db $33, $03
-                db $34, $03
-                db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db  -1
-Unknown_8d8cd: 	db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db $30, $03
-                db $31, $03
-                db $30, $03
-                db $31, $43
-                db $32, $03
-                db $33, $03
-                db $34, $03
-                db  -4
-Unknown_8d8ec: 	db $67, $03
-                db $68, $03
-                db  -2
-Unknown_8d8f1: 	db $6c, $03
-                db  -1
-Unknown_8d8f4: 	db $6d, $03
-                db  -1
-Unknown_8d8f7: 	db $69, $02
-                db $6a, $02
-                db $6b, $02
-                db  -4
-Unknown_8d8fe: 	db $6e, $03
-                db $6f, $03
-                db $70, $03
-                db $71, $03
-                db  -2
-Unknown_8d907: 	db $71, $03
-                db $6e, $07
-                db  -1
-Unknown_8d90c: 	db $72, $20
-                db $73, $07
-                db $74, $07
-                db  -1
-Unknown_8d913: 	db $75, $03
-                db  -1
-Unknown_8d916: 	db $76, $03
-                db $77, $03
-                db $78, $07
-                db  -4
-Unknown_8d91d: 	db $76, $43
-                db $77, $43
-                db $78, $47
-                db  -4
-Unknown_8d924: 	db $76, $83
-                db $77, $83
-                db $78, $87
-                db  -4
-Unknown_8d92b: 	db $76, $c3
-                db $77, $c3
-                db $78, $c7
-                db  -4
-Unknown_8d932: 	db $79, $03
-                db $7a, $03
-                db $7b, $03
-                db $7c, $07
-                db $7d, $07
-                db  -1
-Unknown_8d93d: 	db $7e, $03
-                db  -1
-Unknown_8d940: 	db  -3, $00
-                db  -1
-Unknown_8d943: 	db $7f, $08
-                db $80, $08
-                db  -1
-Unknown_8d948: 	db $7f, $48
-                db $80, $48
-                db  -1
+.Frameset_00:
+	db $00, $20
+	db -1
+
+.Frameset_01:
+	db $00, $08
+	db $01, $08
+	db -2
+
+.Frameset_02:
+	db $3d, $08
+	db $3e, $08
+	db -2
+
+.Frameset_03:
+	db $3f, $08
+	db $40, $08
+	db -2
+
+.Frameset_04:
+	db $00, $04
+	db $01, $04
+	db -2
+
+.Frameset_05:
+	db $3d, $04
+	db $3e, $04
+	db -2
+
+.Frameset_06:
+	db $3f, $04
+	db $40, $04
+	db -2
+
+.Frameset_11:
+	db $00, $08
+	db $01, $08
+	db $00, $08
+	db $01, $48
+	db -2
+
+.Frameset_2d:
+	db $63, $08
+	db $64, $08
+	db $63, $08
+	db $64, $48
+	db -2
+
+.Frameset_2e:
+	db $65, $08
+	db $66, $08
+	db $65, $08
+	db $66, $48
+	db -2
+
+.Frameset_07:
+	db $1e, $01
+	db $1f, $01
+	db -2
+
+.Frameset_08:
+	db $20, $01
+	db -3, $01
+	db -2
+
+.Frameset_09:
+	db $21, $01
+	db -3, $01
+	db -2
+
+.Frameset_0a:
+	db $81, $0c
+	db $82, $01
+	db $83, $01
+	db $82, $04
+	db $81, $0c
+	db $82, $0c
+	db $83, $04
+	db $84, $20
+	db $85, $03
+	db $86, $03
+	db $87, $04
+	db $88, $04
+	db $89, $04
+	db $8a, $0a
+	db $8b, $07
+	db -1
+
+.Frameset_0b:
+	db $23, $03
+	db $23, $83
+	db -2
+
+.Frameset_0c:
+	db $24, $02
+	db $25, $02
+	db $26, $02
+	db $25, $02
+	db -2
+
+.Frameset_0d:
+	db $27, $07
+	db $28, $07
+	db $27, $87
+	db $28, $47
+	db -2
+
+.Frameset_0e:
+	db $29, $07
+	db $2a, $07
+	db $29, $07
+	db $2b, $07
+	db -2
+
+.Frameset_0f:
+	db $29, $07
+	db $2c, $07
+	db $2d, $07
+	db $2c, $07
+	db $29, $07
+	db -1
+
+.Frameset_10:
+	db $2e, $14
+	db -1
+
+.Frameset_12:
+	db $2f, $20
+	db -1
+
+.Frameset_13:
+	db $30, $20
+	db -1
+
+.Frameset_14:
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db -2
+
+.Frameset_15:
+	db $32, $04
+	db $33, $04
+	db $34, $04
+	db -4
+
+.Frameset_16:
+	db $35, $03
+	db $36, $03
+	db -2
+
+.Frameset_17:
+	db $37, $07
+	db $38, $07
+	db -2
+
+.Frameset_18:
+	db $39, $20
+	db -1
+
+.Frameset_19:
+	db $3b, $02
+	db $3a, $02
+	db $3b, $02
+	db -1
+
+.Frameset_1a:
+	db $3c, $20
+	db -1
+
+.Frameset_1b:
+	db $41, $08
+	db $42, $08
+	db $41, $08
+	db $42, $48
+	db -2
+	db $43, $08
+	db $44, $08
+	db -2
+	db $45, $08
+	db $46, $08
+	db -2
+	db $47, $08
+	db $48, $08
+	db -2
+	db $49, $01
+	db $49, $41
+	db $49, $c1
+	db $49, $81
+	db -2
+	db $4a, $20
+	db -1
+	db $4b, $20
+	db -1
+	db $4c, $20
+	db -1
+	db $4d, $20
+	db -1
+	db $4e, $03
+	db -3, $03
+	db -2
+
+.Frameset_1c:
+	db -3, $20
+	db -1
+
+.Frameset_1d:
+	db $4f, $20
+	db -1
+
+.Frameset_1e:
+	db $50, $02
+	db $51, $10
+	db -3, $01
+	db $52, $01
+	db -3, $01
+	db $53, $01
+	db -4
+
+.Frameset_1f:
+	db $54, $20
+	db -1
+
+.Frameset_20:
+	db $55, $20
+	db -1
+
+.Frameset_21:
+	db $55, $60
+	db -1
+
+.Frameset_22:
+	db $55, $a0
+	db -1
+
+.Frameset_23:
+	db $55, $e0
+	db -1
+
+.Frameset_24:
+	db $56, $0a
+	db $57, $09
+	db $58, $0a
+	db $59, $0a
+	db $58, $09
+	db $5a, $0a
+	db -2
+
+.Frameset_25:
+	db $50, $02
+	db $5b, $02
+	db $50, $02
+	db $5b, $42
+	db -2
+
+.Frameset_26:
+	db $5c, $02
+	db -1
+
+.Frameset_27:
+	db $5d, $02
+	db -1
+
+.Frameset_28:
+	db $5e, $02
+	db -1
+
+.Frameset_29:
+	db $5f, $02
+	db -1
+
+.Frameset_2a:
+	db $60, $02
+	db -1
+
+.Frameset_2b:
+	db $61, $02
+	db -1
+
+.Frameset_2c:
+	db $62, $02
+	db -1
+
+.Frameset_2f:
+	db $32, $03
+	db $33, $03
+	db $34, $03
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db -1
+
+.Frameset_30:
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db $30, $03
+	db $31, $03
+	db $30, $03
+	db $31, $43
+	db $32, $03
+	db $33, $03
+	db $34, $03
+	db -4
+
+.Frameset_31:
+	db $67, $03
+	db $68, $03
+	db -2
+
+.Frameset_32:
+	db $6c, $03
+	db -1
+
+.Frameset_33:
+	db $6d, $03
+	db -1
+
+.Frameset_34:
+	db $69, $02
+	db $6a, $02
+	db $6b, $02
+	db -4
+
+.Frameset_35:
+	db $6e, $03
+	db $6f, $03
+	db $70, $03
+	db $71, $03
+	db -2
+
+.Frameset_36:
+	db $71, $03
+	db $6e, $07
+	db -1
+
+.Frameset_37:
+	db $72, $20
+	db $73, $07
+	db $74, $07
+	db -1
+
+.Frameset_38:
+	db $75, $03
+	db -1
+
+.Frameset_39:
+	db $76, $03
+	db $77, $03
+	db $78, $07
+	db -4
+
+.Frameset_3a:
+	db $76, $43
+	db $77, $43
+	db $78, $47
+	db -4
+
+.Frameset_3b:
+	db $76, $83
+	db $77, $83
+	db $78, $87
+	db -4
+
+.Frameset_3c:
+	db $76, $c3
+	db $77, $c3
+	db $78, $c7
+	db -4
+
+.Frameset_3d:
+	db $79, $03
+	db $7a, $03
+	db $7b, $03
+	db $7c, $07
+	db $7d, $07
+	db -1
+
+.Frameset_3e:
+	db $7e, $03
+	db -1
+
+.Frameset_3f:
+	db -3, $00
+	db -1
+
+.Frameset_40:
+	db $7f, $08
+	db $80, $08
+	db -1
+
+.Frameset_41:
+	db $7f, $48
+	db $80, $48
+	db -1
 ; 8d94d
 
 SpriteAnimOAMData: ; 8d94d
 	; vtile offset, pointer
-	dbw $00, Unknown_8dd8a ; 00
-	dbw $04, Unknown_8dd8a ; 01
-	dbw $4c, Unknown_8daf1 ; 02
-	dbw $5c, Unknown_8daf1 ; 03
-	dbw $6c, Unknown_8daf6 ; 04
-	dbw $6e, Unknown_8daf6 ; 05
-	dbw $2d, Unknown_8ddf0 ; 06
-	dbw $4d, Unknown_8ddf0 ; 07
-	dbw $60, Unknown_8de09 ; 08
-	dbw $00, Unknown_8de09 ; 09
-	dbw $00, Unknown_8de09 ; 0a
-	dbw $06, Unknown_8de09 ; 0b
-	dbw $0c, Unknown_8de7e ; 0c
-	dbw $0d, Unknown_8daf1 ; 0d
-	dbw $00, Unknown_8dc53 ; 0e
-	dbw $04, Unknown_8dc53 ; 0f
-	dbw $08, Unknown_8dc53 ; 10
-	dbw $40, Unknown_8dc53 ; 11
-	dbw $44, Unknown_8dc53 ; 12
-	dbw $48, Unknown_8dc53 ; 13
-	dbw $4c, Unknown_8dc53 ; 14
-	dbw $80, Unknown_8de87 ; 15
-	dbw $85, Unknown_8de87 ; 16
-	dbw $8a, Unknown_8de87 ; 17
-	dbw $00, Unknown_8db29 ; 18
-	dbw $01, Unknown_8db5c ; 19
-	dbw $09, Unknown_8db9d ; 1a
-	dbw $10, Unknown_8dc94 ; 1b
-	dbw $29, Unknown_8dc94 ; 1c
-	dbw $42, Unknown_8dc94 ; 1d
-	dbw $f8, Unknown_8e17e ; 1e
-	dbw $fa, Unknown_8e17e ; 1f
-	dbw $00, Unknown_8deb2 ; 20
-	dbw $00, Unknown_8dec3 ; 21
-	dbw $00, Unknown_8deec ; 22
-	dbw $0f, Unknown_8db07 ; 23
-	dbw $11, Unknown_8daf1 ; 24
-	dbw $12, Unknown_8daf1 ; 25
-	dbw $13, Unknown_8daf1 ; 26
-	dbw $00, Unknown_8df29 ; 27
-	dbw $08, Unknown_8df29 ; 28
-	dbw $10, Unknown_8df42 ; 29
-	dbw $10, Unknown_8df5b ; 2a
-	dbw $10, Unknown_8df74 ; 2b
-	dbw $10, Unknown_8df8d ; 2c
-	dbw $10, Unknown_8dfa6 ; 2d
-	dbw $3a, Unknown_8daf1 ; 2e
-	dbw $00, Unknown_8dd8a ; 2f
-	dbw $00, Unknown_8db18 ; 30
-	dbw $02, Unknown_8dd9b ; 31
-	dbw $06, Unknown_8db5c ; 32
-	dbw $0a, Unknown_8db5c ; 33
-	dbw $0e, Unknown_8db5c ; 34
-	dbw $12, Unknown_8db3a ; 35
-	dbw $13, Unknown_8db3a ; 36
-	dbw $00, Unknown_8dd8a ; 37
-	dbw $04, Unknown_8dd8a ; 38
-	dbw $10, Unknown_8db5c ; 39
-	dbw $00, Unknown_8dd9b ; 3a
-	dbw $04, Unknown_8daf1 ; 3b
-	dbw $00, Unknown_8dfbf ; 3c
-	dbw $00, Unknown_8ddac ; 3d
-	dbw $00, Unknown_8ddbd ; 3e
-	dbw $00, Unknown_8ddce ; 3f
-	dbw $00, Unknown_8dddf ; 40
-	dbw $00, Unknown_8dd9b ; 41
-	dbw $04, Unknown_8dd9b ; 42
-	dbw $00, Unknown_8dc2e ; 43
-	dbw $30, Unknown_8dc2e ; 44
-	dbw $03, Unknown_8dc2e ; 45
-	dbw $33, Unknown_8dc2e ; 46
-	dbw $06, Unknown_8dc2e ; 47
-	dbw $36, Unknown_8dc2e ; 48
-	dbw $09, Unknown_8dc2e ; 49
-	dbw $39, Unknown_8dc2e ; 4a
-	dbw $0c, Unknown_8dfcc ; 4b
-	dbw $0c, Unknown_8dfe5 ; 4c
-	dbw $3c, Unknown_8daf1 ; 4d
-	dbw $3e, Unknown_8daf1 ; 4e
-	dbw $00, Unknown_8de9c ; 4f
-	dbw $00, Unknown_8dea1 ; 50
-	dbw $00, Unknown_8dff6 ; 51
-	dbw $00, Unknown_8e007 ; 52
-	dbw $00, Unknown_8e018 ; 53
-	dbw $00, Unknown_8daf1 ; 54
-	dbw $01, Unknown_8daf1 ; 55
-	dbw $00, Unknown_8e029 ; 56
-	dbw $00, Unknown_8e076 ; 57
-	dbw $00, Unknown_8e0b7 ; 58
-	dbw $00, Unknown_8e0f4 ; 59
-	dbw $00, Unknown_8e139 ; 5a
-	dbw $04, Unknown_8dea1 ; 5b
-	dbw $00, Unknown_8e183 ; 5c
-	dbw $00, Unknown_8e1b4 ; 5d
-	dbw $00, Unknown_8e1b9 ; 5e
-	dbw $00, Unknown_8e1ca ; 5f
-	dbw $00, Unknown_8e1eb ; 60
-	dbw $00, Unknown_8e1f0 ; 61
-	dbw $00, Unknown_8e1f9 ; 62
-	dbw $00, Unknown_8e202 ; 63
-	dbw $04, Unknown_8e202 ; 64
-	dbw $00, Unknown_8e213 ; 65
-	dbw $04, Unknown_8e213 ; 66
-	dbw $20, Unknown_8e224 ; 67
-	dbw $21, Unknown_8e224 ; 68
-	dbw $22, Unknown_8e24b ; 69
-	dbw $23, Unknown_8e25c ; 6a
-	dbw $27, Unknown_8e27d ; 6b
-	dbw $2a, Unknown_8e229 ; 6c
-	dbw $2a, Unknown_8e23a ; 6d
-	dbw $00, Unknown_8e2ae ; 6e
-	dbw $08, Unknown_8e33f ; 6f
-	dbw $60, Unknown_8e3b0 ; 70
-	dbw $68, Unknown_8e429 ; 71
-	dbw $00, Unknown_8e4a6 ; 72
-	dbw $05, Unknown_8e4a6 ; 73
-	dbw $0a, Unknown_8e4a6 ; 74
-	dbw $50, Unknown_8e50b ; 75
-	dbw $00, Unknown_8e54c ; 76
-	dbw $01, Unknown_8e551 ; 77
-	dbw $04, Unknown_8e55e ; 78
-	dbw $00, Unknown_8db29 ; 79
-	dbw $01, Unknown_8e57b ; 7a
-	dbw $03, Unknown_8e59c ; 7b
-	dbw $08, Unknown_8e5cd ; 7c
-	dbw $1c, Unknown_8e5cd ; 7d
-	dbw $80, Unknown_8e61e ; 7e
-	dbw $00, Unknown_8e66f ; 7f
-	dbw $04, Unknown_8e66f ; 80
-	dbw $d0, Unknown_8e680 ; 81
-	dbw $d3, Unknown_8e680 ; 82
-	dbw $d6, Unknown_8e680 ; 83
-	dbw $6c, Unknown_8e6a5 ; 84
-	dbw $68, Unknown_8e6a5 ; 85
-	dbw $64, Unknown_8e6a5 ; 86
-	dbw $60, Unknown_8e6a5 ; 87
-	dbw $0c, Unknown_8e6a5 ; 88
-	dbw $08, Unknown_8e6a5 ; 89
-	dbw $04, Unknown_8e6a5 ; 8a
-	dbw $00, Unknown_8e6a5 ; 8b
-; 8daf1
-
+	dbw $00, .OAMData_00 ; 00
+	dbw $04, .OAMData_00 ; 01
+	dbw $4c, .OAMData_02 ; 02
+	dbw $5c, .OAMData_02 ; 03
+	dbw $6c, .OAMData_04 ; 04
+	dbw $6e, .OAMData_04 ; 05
+	dbw $2d, .OAMData_06 ; 06
+	dbw $4d, .OAMData_06 ; 07
+	dbw $60, .OAMData_08 ; 08
+	dbw $00, .OAMData_08 ; 09
+	dbw $00, .OAMData_08 ; 0a
+	dbw $06, .OAMData_08 ; 0b
+	dbw $0c, .OAMData_0c ; 0c
+	dbw $0d, .OAMData_02 ; 0d
+	dbw $00, .OAMData_0e ; 0e
+	dbw $04, .OAMData_0e ; 0f
+	dbw $08, .OAMData_0e ; 10
+	dbw $40, .OAMData_0e ; 11
+	dbw $44, .OAMData_0e ; 12
+	dbw $48, .OAMData_0e ; 13
+	dbw $4c, .OAMData_0e ; 14
+	dbw $80, .OAMData_15 ; 15
+	dbw $85, .OAMData_15 ; 16
+	dbw $8a, .OAMData_15 ; 17
+	dbw $00, .OAMData_18 ; 18
+	dbw $01, .OAMData_19 ; 19
+	dbw $09, .OAMData_1a ; 1a
+	dbw $10, .OAMData_1b ; 1b
+	dbw $29, .OAMData_1b ; 1c
+	dbw $42, .OAMData_1b ; 1d
+	dbw $f8, .OAMData_1e ; 1e
+	dbw $fa, .OAMData_1e ; 1f
+	dbw $00, .OAMData_20 ; 20
+	dbw $00, .OAMData_21 ; 21
+	dbw $00, .OAMData_22 ; 22
+	dbw $0f, .OAMData_23 ; 23
+	dbw $11, .OAMData_02 ; 24
+	dbw $12, .OAMData_02 ; 25
+	dbw $13, .OAMData_02 ; 26
+	dbw $00, .OAMData_27 ; 27
+	dbw $08, .OAMData_27 ; 28
+	dbw $10, .OAMData_29 ; 29
+	dbw $10, .OAMData_2a ; 2a
+	dbw $10, .OAMData_2b ; 2b
+	dbw $10, .OAMData_2c ; 2c
+	dbw $10, .OAMData_2d ; 2d
+	dbw $3a, .OAMData_02 ; 2e
+	dbw $00, .OAMData_00 ; 2f
+	dbw $00, .OAMData_30 ; 30
+	dbw $02, .OAMData_31 ; 31
+	dbw $06, .OAMData_19 ; 32
+	dbw $0a, .OAMData_19 ; 33
+	dbw $0e, .OAMData_19 ; 34
+	dbw $12, .OAMData_35 ; 35
+	dbw $13, .OAMData_35 ; 36
+	dbw $00, .OAMData_00 ; 37
+	dbw $04, .OAMData_00 ; 38
+	dbw $10, .OAMData_19 ; 39
+	dbw $00, .OAMData_31 ; 3a
+	dbw $04, .OAMData_02 ; 3b
+	dbw $00, .OAMData_3c ; 3c
+	dbw $00, .OAMData_3d ; 3d
+	dbw $00, .OAMData_3e ; 3e
+	dbw $00, .OAMData_3f ; 3f
+	dbw $00, .OAMData_40 ; 40
+	dbw $00, .OAMData_31 ; 41
+	dbw $04, .OAMData_31 ; 42
+	dbw $00, .OAMData_43 ; 43
+	dbw $30, .OAMData_43 ; 44
+	dbw $03, .OAMData_43 ; 45
+	dbw $33, .OAMData_43 ; 46
+	dbw $06, .OAMData_43 ; 47
+	dbw $36, .OAMData_43 ; 48
+	dbw $09, .OAMData_43 ; 49
+	dbw $39, .OAMData_43 ; 4a
+	dbw $0c, .OAMData_4b ; 4b
+	dbw $0c, .OAMData_4c ; 4c
+	dbw $3c, .OAMData_02 ; 4d
+	dbw $3e, .OAMData_02 ; 4e
+	dbw $00, .OAMData_4f ; 4f
+	dbw $00, .OAMData_50 ; 50
+	dbw $00, .OAMData_51 ; 51
+	dbw $00, .OAMData_52 ; 52
+	dbw $00, .OAMData_53 ; 53
+	dbw $00, .OAMData_02 ; 54
+	dbw $01, .OAMData_02 ; 55
+	dbw $00, .OAMData_56 ; 56
+	dbw $00, .OAMData_57 ; 57
+	dbw $00, .OAMData_58 ; 58
+	dbw $00, .OAMData_59 ; 59
+	dbw $00, .OAMData_5a ; 5a
+	dbw $04, .OAMData_50 ; 5b
+	dbw $00, .OAMData_5c ; 5c
+	dbw $00, .OAMData_5d ; 5d
+	dbw $00, .OAMData_5e ; 5e
+	dbw $00, .OAMData_5f ; 5f
+	dbw $00, .OAMData_60 ; 60
+	dbw $00, .OAMData_61 ; 61
+	dbw $00, .OAMData_62 ; 62
+	dbw $00, .OAMData_63 ; 63
+	dbw $04, .OAMData_63 ; 64
+	dbw $00, .OAMData_65 ; 65
+	dbw $04, .OAMData_65 ; 66
+	dbw $20, .OAMData_67 ; 67
+	dbw $21, .OAMData_67 ; 68
+	dbw $22, .OAMData_69 ; 69
+	dbw $23, .OAMData_6a ; 6a
+	dbw $27, .OAMData_6b ; 6b
+	dbw $2a, .OAMData_6c ; 6c
+	dbw $2a, .OAMData_6d ; 6d
+	dbw $00, .OAMData_6e ; 6e
+	dbw $08, .OAMData_6f ; 6f
+	dbw $60, .OAMData_70 ; 70
+	dbw $68, .OAMData_71 ; 71
+	dbw $00, .OAMData_72 ; 72
+	dbw $05, .OAMData_72 ; 73
+	dbw $0a, .OAMData_72 ; 74
+	dbw $50, .OAMData_75 ; 75
+	dbw $00, .OAMData_76 ; 76
+	dbw $01, .OAMData_77 ; 77
+	dbw $04, .OAMData_78 ; 78
+	dbw $00, .OAMData_18 ; 79
+	dbw $01, .OAMData_7a ; 7a
+	dbw $03, .OAMData_7b ; 7b
+	dbw $08, .OAMData_7c ; 7c
+	dbw $1c, .OAMData_7c ; 7d
+	dbw $80, .OAMData_7e ; 7e
+	dbw $00, .OAMData_7f ; 7f
+	dbw $04, .OAMData_7f ; 80
+	dbw $d0, .OAMData_81 ; 81
+	dbw $d3, .OAMData_81 ; 82
+	dbw $d6, .OAMData_81 ; 83
+	dbw $6c, .OAMData_84 ; 84
+	dbw $68, .OAMData_84 ; 85
+	dbw $64, .OAMData_84 ; 86
+	dbw $60, .OAMData_84 ; 87
+	dbw $0c, .OAMData_84 ; 88
+	dbw $08, .OAMData_84 ; 89
+	dbw $04, .OAMData_84 ; 8a
+	dbw $00, .OAMData_84 ; 8b
 
-Unknown_8daf1: ; 8daf1
+.OAMData_02
 	db 1
 	dsprite -1,  4, -1,  4, $00, $00
-; 8daf6
 
-Unknown_8daf6: ; 8daf6
+.OAMData_04
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
 	dsprite -1,  0,  0,  0, $01, $00
 	dsprite  0,  0, -1,  0, $10, $00
 	dsprite  0,  0,  0,  0, $11, $00
-; 8db07
 
-Unknown_8db07: ; 8db07
+.OAMData_23
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
 	dsprite -1,  0,  0,  0, $00, $20
 	dsprite  0,  0, -1,  0, $01, $00
 	dsprite  0,  0,  0,  0, $01, $20
-; 8db18
 
-Unknown_8db18: ; 8db18
+.OAMData_30
 	db 4
 	dsprite -1,  0, -1,  0, $00, $80
 	dsprite -1,  0,  0,  0, $00, $a0
 	dsprite  0,  0, -1,  0, $01, $80
 	dsprite  0,  0,  0,  0, $01, $a0
-; 8db29
 
-Unknown_8db29: ; 8db29
+.OAMData_18
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
 	dsprite -1,  0,  0,  0, $00, $20
 	dsprite  0,  0, -1,  0, $00, $40
 	dsprite  0,  0,  0,  0, $00, $60
-; 8db3a
 
-Unknown_8db3a: ; 8db3a
+.OAMData_35
 	db 4
 	dsprite -1,  0, -1,  0, $00, $07
 	dsprite -1,  0,  0,  0, $00, $27
@@ -544,9 +668,8 @@
 	dsprite -1,  0,  0,  0, $00, $a0
 	dsprite  0,  0, -1,  0, $00, $c0
 	dsprite  0,  0,  0,  0, $00, $e0
-; 8db5c
 
-Unknown_8db5c: ; 8db5c
+.OAMData_19
 	db 16
 	dsprite -2,  0, -2,  0, $00, $00
 	dsprite -2,  0, -1,  0, $01, $00
@@ -564,9 +687,8 @@
 	dsprite  0,  0,  1,  0, $02, $60
 	dsprite  1,  0,  0,  0, $01, $60
 	dsprite  1,  0,  1,  0, $00, $60
-; 8db9d
 
-Unknown_8db9d: ; 8db9d
+.OAMData_1a
 	db 36
 	dsprite -3,  0, -3,  0, $00, $00
 	dsprite -3,  0, -2,  0, $01, $00
@@ -604,9 +726,8 @@
 	dsprite  2,  0,  0,  0, $02, $60
 	dsprite  2,  0,  1,  0, $01, $60
 	dsprite  2,  0,  2,  0, $00, $60
-; 8dc2e
 
-Unknown_8dc2e: ; 8dc2e
+.OAMData_43
 	db 9
 	dsprite -2,  4, -2,  4, $00, $00
 	dsprite -2,  4, -1,  4, $01, $00
@@ -617,9 +738,8 @@
 	dsprite  0,  4, -2,  4, $20, $00
 	dsprite  0,  4, -1,  4, $21, $00
 	dsprite  0,  4,  0,  4, $22, $00
-; 8dc53
 
-Unknown_8dc53: ; 8dc53
+.OAMData_0e
 	db 16
 	dsprite -2,  0, -2,  0, $00, $00
 	dsprite -2,  0, -1,  0, $01, $00
@@ -637,9 +757,8 @@
 	dsprite  1,  0, -1,  0, $31, $00
 	dsprite  1,  0,  0,  0, $32, $00
 	dsprite  1,  0,  1,  0, $33, $00
-; 8dc94
 
-Unknown_8dc94: ; 8dc94
+.OAMData_1b
 	db 25
 	dsprite -3,  4, -3,  4, $00, $00
 	dsprite -2,  4, -3,  4, $01, $00
@@ -706,9 +825,8 @@
 	dsprite  2,  0,  0,  0, $21, $00
 	dsprite  2,  0,  1,  0, $22, $00
 	dsprite  2,  0,  2,  0, $23, $00
-; 8dd8a
 
-Unknown_8dd8a: ; 8dd8a
+.OAMData_00
 ; party menu icons
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
@@ -715,17 +833,15 @@
 	dsprite -1,  0,  0,  0, $01, $00
 	dsprite  0,  0, -1,  0, $02, $00
 	dsprite  0,  0,  0,  0, $03, $00
-; 8dd9b
 
-Unknown_8dd9b: ; 8dd9b
+.OAMData_31
 	db 4
 	dsprite -1,  0, -1,  0, $00, $80
 	dsprite -1,  0,  0,  0, $01, $80
 	dsprite  0,  0, -1,  0, $02, $80
 	dsprite  0,  0,  0,  0, $03, $80
-; 8ddac
 
-Unknown_8ddac: ; 8ddac
+.OAMData_3d
 ; party menu icon with mail, frame 1
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
@@ -732,9 +848,8 @@
 	dsprite -1,  0,  0,  0, $01, $00
 	dsprite  0,  0, -1,  0, $08, $00
 	dsprite  0,  0,  0,  0, $03, $00
-; 8ddbd
 
-Unknown_8ddbd: ; 8ddbd
+.OAMData_3e
 ; party menu icon with mail, frame 2
 	db 4
 	dsprite -1,  0, -1,  0, $04, $00
@@ -741,9 +856,8 @@
 	dsprite -1,  0,  0,  0, $05, $00
 	dsprite  0,  0, -1,  0, $08, $00
 	dsprite  0,  0,  0,  0, $07, $00
-; 8ddce
 
-Unknown_8ddce: ; 8ddce
+.OAMData_3f
 ; party menu icon with item, frame 1
 	db 4
 	dsprite -1,  0, -1,  0, $00, $00
@@ -750,9 +864,8 @@
 	dsprite -1,  0,  0,  0, $01, $00
 	dsprite  0,  0, -1,  0, $09, $00
 	dsprite  0,  0,  0,  0, $03, $00
-; 8dddf
 
-Unknown_8dddf: ; 8dddf
+.OAMData_40
 ; party menu icon with item, frame 2
 	db 4
 	dsprite -1,  0, -1,  0, $04, $00
@@ -759,9 +872,8 @@
 	dsprite -1,  0,  0,  0, $05, $00
 	dsprite  0,  0, -1,  0, $09, $00
 	dsprite  0,  0,  0,  0, $07, $00
-; 8ddf0
 
-Unknown_8ddf0: ; 8ddf0
+.OAMData_06
 	db 6
 	dsprite -1,  0, -2,  4, $00, $01
 	dsprite -1,  0, -1,  4, $01, $01
@@ -769,9 +881,8 @@
 	dsprite  0,  0, -2,  4, $10, $01
 	dsprite  0,  0, -1,  4, $11, $01
 	dsprite  0,  0,  0,  4, $12, $01
-; 8de09
 
-Unknown_8de09: ; 8de09
+.OAMData_08
 	db 29
 	dsprite -3,  0, -3,  0, $00, $00
 	dsprite -3,  0, -2,  0, $01, $00
@@ -802,15 +913,13 @@
 	dsprite  2,  0,  0,  0, $53, $80
 	dsprite  2,  0,  1,  0, $54, $80
 	dsprite  2,  0,  2,  0, $55, $80
-; 8de7e
 
-Unknown_8de7e: ; 8de7e
+.OAMData_0c
 	db 2
 	dsprite -1,  0, -1,  4, $00, $00
 	dsprite  0,  0, -1,  4, $10, $00
-; 8de87
 
-Unknown_8de87: ; 8de87
+.OAMData_15
 	db 5
 	dsprite -2,  0,  3,  0, $00, $00
 	dsprite -2,  0,  4,  0, $01, $00
@@ -817,30 +926,26 @@
 	dsprite -1,  0,  2,  0, $02, $00
 	dsprite -1,  0,  3,  0, $03, $00
 	dsprite  0,  0,  2,  0, $04, $00
-; 8de9c
 
-Unknown_8de9c: ; 8de9c
+.OAMData_4f
 	db 1
 	dsprite -1,  4, -1,  4, $00, $06
-; 8dea1
 
-Unknown_8dea1: ; 8dea1
+.OAMData_50
 	db 4
 	dsprite -1,  0, -1,  0, $00, $06
 	dsprite -1,  0,  0,  0, $01, $06
 	dsprite  0,  0, -1,  0, $02, $06
 	dsprite  0,  0,  0,  0, $03, $06
-; 8deb2
 
-Unknown_8deb2: ; 8deb2
+.OAMData_20
 	db 4
 	dsprite -1,  7, -1,  7, $00, $00
 	dsprite -1,  7,  0,  0, $00, $20
 	dsprite  0,  0, -1,  7, $00, $40
 	dsprite  0,  0,  0,  0, $00, $60
-; 8dec3
 
-Unknown_8dec3: ; 8dec3
+.OAMData_21
 	db 10
 	dsprite -1,  7,  0,  0, $00, $00
 	dsprite -1,  7,  1,  0, $01, $00
@@ -852,9 +957,8 @@
 	dsprite  0,  0,  2,  0, $01, $40
 	dsprite  0,  0,  3,  0, $01, $40
 	dsprite  0,  0,  4,  0, $00, $60
-; 8deec
 
-Unknown_8deec: ; 8deec
+.OAMData_22
 	db 15
 	dsprite -3,  4, -2,  4, $00, $11
 	dsprite -3,  4, -1,  4, $01, $11
@@ -871,9 +975,8 @@
 	dsprite  1,  4, -2,  4, $0c, $11
 	dsprite  1,  4, -1,  4, $0d, $11
 	dsprite  1,  4,  0,  4, $0e, $11
-; 8df29
 
-Unknown_8df29: ; 8df29
+.OAMData_27
 	db 6
 	dsprite -2,  4, -2,  4, $00, $15
 	dsprite -2,  4, -1,  4, $02, $15
@@ -881,9 +984,8 @@
 	dsprite  0,  4, -2,  4, $04, $15
 	dsprite  0,  4, -1,  4, $06, $15
 	dsprite  0,  4,  0,  4, $04, $35
-; 8df42
 
-Unknown_8df42: ; 8df42
+.OAMData_29
 	db 6
 	dsprite -2,  4, -2,  4, $00, $16
 	dsprite -2,  4, -1,  4, $02, $16
@@ -891,9 +993,8 @@
 	dsprite  0,  4, -2,  4, $06, $16
 	dsprite  0,  4, -1,  4, $08, $16
 	dsprite  0,  4,  0,  4, $0a, $16
-; 8df5b
 
-Unknown_8df5b: ; 8df5b
+.OAMData_2a
 	db 6
 	dsprite -2,  4, -2,  4, $00, $16
 	dsprite -2,  4, -1,  4, $02, $16
@@ -901,9 +1002,8 @@
 	dsprite  0,  4, -2,  4, $0c, $16
 	dsprite  0,  4, -1,  4, $0e, $16
 	dsprite  0,  4,  0,  4, $10, $16
-; 8df74
 
-Unknown_8df74: ; 8df74
+.OAMData_2b
 	db 6
 	dsprite -2,  4, -2,  4, $00, $16
 	dsprite -2,  4, -1,  4, $02, $16
@@ -911,9 +1011,8 @@
 	dsprite  0,  4, -2,  4, $12, $16
 	dsprite  0,  4, -1,  4, $14, $16
 	dsprite  0,  4,  0,  4, $16, $16
-; 8df8d
 
-Unknown_8df8d: ; 8df8d
+.OAMData_2c
 	db 6
 	dsprite -2,  4, -2,  4, $00, $16
 	dsprite -2,  4, -1,  4, $02, $16
@@ -921,9 +1020,8 @@
 	dsprite  0,  4, -2,  4, $18, $16
 	dsprite  0,  4, -1,  4, $1a, $16
 	dsprite  0,  4,  0,  4, $1c, $16
-; 8dfa6
 
-Unknown_8dfa6: ; 8dfa6
+.OAMData_2d
 	db 6
 	dsprite -2,  4, -2,  4, $1e, $16
 	dsprite -2,  4, -1,  4, $20, $16
@@ -931,16 +1029,14 @@
 	dsprite  0,  4, -2,  4, $24, $16
 	dsprite  0,  4, -1,  4, $26, $16
 	dsprite  0,  4,  0,  4, $28, $16
-; 8dfbf
 
-Unknown_8dfbf: ; 8dfbf
+.OAMData_3c
 	db 3
 	dsprite -2,  4, -1,  4, $00, $10
 	dsprite -1,  4, -1,  4, $00, $10
 	dsprite  0,  4, -1,  4, $00, $10
-; 8dfcc
 
-Unknown_8dfcc: ; 8dfcc
+.OAMData_4b
 	db 6
 	dsprite  0,  0,  0,  0, $00, $00
 	dsprite  0,  0,  1,  0, $01, $00
@@ -948,41 +1044,36 @@
 	dsprite  0,  0,  3,  0, $01, $00
 	dsprite  0,  0,  4,  0, $02, $00
 	dsprite  0,  0,  5,  0, $03, $00
-; 8dfe5
 
-Unknown_8dfe5: ; 8dfe5
+.OAMData_4c
 	db 4
 	dsprite  0,  0,  0,  0, $00, $00
 	dsprite  0,  0,  1,  0, $01, $00
 	dsprite  0,  0,  2,  0, $02, $00
 	dsprite  0,  0,  3,  0, $03, $00
-; 8dff6
 
-Unknown_8dff6: ; 8dff6
+.OAMData_51
 	db 4
 	dsprite -1,  0, -2,  6, $00, $06
 	dsprite -1,  0,  0,  2, $01, $06
 	dsprite  0,  0, -2,  6, $02, $06
 	dsprite  0,  0,  0,  2, $03, $06
-; 8e007
 
-Unknown_8e007: ; 8e007
+.OAMData_52
 	db 4
 	dsprite -1,  0, -2,  4, $00, $06
 	dsprite -1,  0,  0,  4, $01, $06
 	dsprite  0,  0, -2,  4, $02, $06
 	dsprite  0,  0,  0,  4, $03, $06
-; 8e018
 
-Unknown_8e018: ; 8e018
+.OAMData_53
 	db 4
 	dsprite -1,  0, -2,  0, $00, $06
 	dsprite -1,  0,  1,  0, $01, $06
 	dsprite  0,  0, -2,  0, $02, $06
 	dsprite  0,  0,  1,  0, $03, $06
-; 8e029
 
-Unknown_8e029: ; 8e029
+.OAMData_56
 	db 19
 	dsprite -1,  0, -4,  0, $00, $00
 	dsprite -2,  0, -3,  0, $02, $00
@@ -1003,9 +1094,8 @@
 	dsprite  1,  0,  2,  0, $20, $00
 	dsprite -2,  0,  3,  0, $22, $00
 	dsprite  0,  0,  3,  0, $24, $00
-; 8e076
 
-Unknown_8e076: ; 8e076
+.OAMData_57
 	db 16
 	dsprite -1,  0, -4,  0, $00, $00
 	dsprite -2,  0, -3,  0, $02, $00
@@ -1023,9 +1113,8 @@
 	dsprite  1,  0,  2,  0, $20, $00
 	dsprite -2,  0,  3,  0, $22, $00
 	dsprite  0,  0,  3,  0, $24, $00
-; 8e0b7
 
-Unknown_8e0b7: ; 8e0b7
+.OAMData_58
 	db 15
 	dsprite -1,  0, -4,  0, $00, $00
 	dsprite -2,  0, -3,  0, $02, $00
@@ -1042,9 +1131,8 @@
 	dsprite  1,  0,  2,  0, $20, $00
 	dsprite -2,  0,  3,  0, $22, $00
 	dsprite  0,  0,  3,  0, $24, $00
-; 8e0f4
 
-Unknown_8e0f4: ; 8e0f4
+.OAMData_59
 	db 17
 	dsprite -1,  0, -4,  0, $00, $00
 	dsprite -2,  0, -3,  0, $02, $00
@@ -1063,9 +1151,8 @@
 	dsprite  1,  0,  2,  0, $20, $00
 	dsprite -2,  0,  3,  0, $22, $00
 	dsprite  0,  0,  3,  0, $24, $00
-; 8e139
 
-Unknown_8e139: ; 8e139
+.OAMData_5a
 	db 17
 	dsprite -1,  0, -4,  0, $00, $00
 	dsprite -2,  0, -3,  0, $02, $00
@@ -1084,14 +1171,12 @@
 	dsprite  1,  0,  2,  0, $20, $00
 	dsprite -2,  0,  3,  0, $22, $00
 	dsprite  0,  0,  3,  0, $24, $00
-; 8e17e
 
-Unknown_8e17e: ; 8e17e
+.OAMData_1e
 	db 1
 	dsprite -1,  4, -1,  4, $00, $11
-; 8e183
 
-Unknown_8e183: ; 8e183
+.OAMData_5c
 	db 12
 	dsprite  0,  0,  0,  0, $30, $00
 	dsprite  0,  0,  1,  0, $31, $00
@@ -1105,22 +1190,19 @@
 	dsprite  1,  0,  3,  0, $34, $00
 	dsprite  1,  0,  4,  0, $34, $00
 	dsprite  1,  0,  5,  0, $35, $00
-; 8e1b4
 
-Unknown_8e1b4: ; 8e1b4
+.OAMData_5d
 	db 1
 	dsprite  0,  0,  0,  0, $ed, $00
-; 8e1b9
 
-Unknown_8e1b9: ; 8e1b9
+.OAMData_5e
 	db 4
 	dsprite -1,  7, -1,  7, $30, $00
 	dsprite -1,  7,  0,  1, $32, $00
 	dsprite  0,  1, -1,  7, $33, $00
 	dsprite  0,  1,  0,  1, $35, $00
-; 8e1ca
 
-Unknown_8e1ca: ; 8e1ca
+.OAMData_5f
 	db 8
 	dsprite -1,  7, -1,  7, $30, $00
 	dsprite -1,  7,  0,  4, $31, $00
@@ -1130,71 +1212,61 @@
 	dsprite  0,  1,  0,  4, $34, $00
 	dsprite  0,  1,  1,  4, $34, $00
 	dsprite  0,  1,  2,  1, $35, $00
-; 8e1eb
 
-Unknown_8e1eb: ; 8e1eb
+.OAMData_60
 	db 1
 	dsprite  0,  0,  0,  0, $34, $00
-; 8e1f0
 
-Unknown_8e1f0: ; 8e1f0
+.OAMData_61
 	db 2
 	dsprite  0,  0,  0,  0, $30, $00
 	dsprite  1,  0,  0,  0, $33, $00
-; 8e1f9
 
-Unknown_8e1f9: ; 8e1f9
+.OAMData_62
 	db 2
 	dsprite  0,  0,  0,  0, $32, $00
 	dsprite  1,  0,  0,  0, $35, $00
-; 8e202
 
-Unknown_8e202: ; 8e202
+.OAMData_63
 	db 4
 	dsprite -1,  0, -1,  0, $00, $01
 	dsprite -1,  0,  0,  0, $01, $01
 	dsprite  0,  0, -1,  0, $02, $01
 	dsprite  0,  0,  0,  0, $03, $01
-; 8e213
 
-Unknown_8e213: ; 8e213
+.OAMData_65
 	db 4
 	dsprite -1,  0, -1,  0, $00, $81
 	dsprite -1,  0,  0,  0, $01, $81
 	dsprite  0,  0, -1,  0, $02, $81
 	dsprite  0,  0,  0,  0, $03, $81
-; 8e224
 
-Unknown_8e224: ; 8e224
+.OAMData_67
 	db 1
 	dsprite -1,  4, -1,  4, $00, $02
-; 8e229
 
-Unknown_8e229: ; 8e229
+.OAMData_6c
 	db 4
 	dsprite -2,  0, -1,  4, $00, $03
 	dsprite -1,  0, -1,  4, $01, $03
 	dsprite  0,  0, -1,  4, $02, $03
 	dsprite  1,  0, -1,  4, $03, $03
-; 8e23a
 
-Unknown_8e23a: ; 8e23a
+.OAMData_6d
 	db 4
 	dsprite -2,  0, -1,  4, $03, $44
 	dsprite -1,  0, -1,  4, $02, $44
 	dsprite  0,  0, -1,  4, $01, $44
 	dsprite  1,  0, -1,  4, $00, $44
-; 8e24b
 
-Unknown_8e24b: ; 8e24b
+.OAMData_69
 	db 4
 	dsprite -1,  0, -1,  0, $00, $01
 	dsprite -1,  0,  0,  0, $00, $21
 	dsprite  0,  0, -1,  0, $00, $41
 	dsprite  0,  0,  0,  0, $00, $61
-; 8e25c
 
-Unknown_8e25c: ; 8e25c
+.OAMData_6a
 	db 8
 	dsprite -2,  4, -2,  4, $00, $01
 	dsprite -2,  4, -1,  4, $01, $01
@@ -1204,9 +1276,8 @@
 	dsprite  0,  4, -2,  4, $00, $41
 	dsprite  0,  4, -1,  4, $01, $41
 	dsprite  0,  4,  0,  4, $00, $61
-; 8e27d
 
-Unknown_8e27d: ; 8e27d
+.OAMData_6b
 	db 12
 	dsprite -2,  0, -2,  0, $00, $01
 	dsprite -2,  0, -1,  0, $01, $01
@@ -1220,9 +1291,8 @@
 	dsprite  0,  0,  1,  0, $02, $61
 	dsprite  1,  0,  0,  0, $01, $61
 	dsprite  1,  0,  1,  0, $00, $61
-; 8e2ae
 
-Unknown_8e2ae: ; 8e2ae
+.OAMData_6e
 	db 36
 	dsprite -3,  0,  1,  0, $05, $00
 	dsprite -3,  0,  2,  0, $06, $00
@@ -1260,9 +1330,8 @@
 	dsprite  2,  0, -4,  0, $50, $00
 	dsprite  2,  0, -3,  0, $51, $00
 	dsprite  2,  0,  3,  0, $57, $00
-; 8e33f
 
-Unknown_8e33f: ; 8e33f
+.OAMData_6f
 	db 28
 	dsprite -3,  0,  0,  0, $04, $00
 	dsprite -3,  0,  1,  0, $05, $00
@@ -1292,9 +1361,8 @@
 	dsprite  2,  0, -1,  0, $53, $00
 	dsprite  2,  0,  0,  0, $54, $00
 	dsprite  2,  0,  1,  0, $55, $00
-; 8e3b0
 
-Unknown_8e3b0: ; 8e3b0
+.OAMData_70
 	db 30
 	dsprite -3,  0,  0,  0, $04, $00
 	dsprite -3,  0,  1,  0, $05, $00
@@ -1326,9 +1394,8 @@
 	dsprite  2,  0, -1,  0, $53, $00
 	dsprite  2,  0,  0,  0, $54, $00
 	dsprite  2,  0,  1,  0, $55, $00
-; 8e429
 
-Unknown_8e429: ; 8e429
+.OAMData_71
 	db 31
 	dsprite -2,  0, -3,  0, $11, $00
 	dsprite -2,  0, -2,  0, $12, $00
@@ -1361,9 +1428,8 @@
 	dsprite  2,  0, -2,  0, $52, $00
 	dsprite  2,  0,  0,  0, $54, $00
 	dsprite  2,  0,  1,  0, $55, $00
-; 8e4a6
 
-Unknown_8e4a6: ; 8e4a6
+.OAMData_72
 	db 25
 	dsprite -3,  4, -3,  4, $00, $09
 	dsprite -3,  4, -2,  4, $01, $09
@@ -1390,9 +1456,8 @@
 	dsprite  1,  4, -1,  4, $42, $09
 	dsprite  1,  4,  0,  4, $43, $09
 	dsprite  1,  4,  1,  4, $44, $09
-; 8e50b
 
-Unknown_8e50b: ; 8e50b
+.OAMData_75
 	db 16
 	dsprite -2,  0, -3,  4, $00, $0a
 	dsprite -2,  0, -2,  4, $01, $0a
@@ -1410,21 +1475,18 @@
 	dsprite  1,  0, -2,  4, $0d, $0a
 	dsprite  1,  0, -1,  4, $0e, $0a
 	dsprite  1,  0,  0,  4, $0f, $0a
-; 8e54c
 
-Unknown_8e54c: ; 8e54c
+.OAMData_76
 	db 1
 	dsprite -1,  4, -1,  4, $00, $00
-; 8e551
 
-Unknown_8e551: ; 8e551
+.OAMData_77
 	db 3
 	dsprite  0,  0, -1,  0, $00, $00
 	dsprite -1,  0, -1,  0, $01, $00
 	dsprite -1,  0,  0,  0, $02, $00
-; 8e55e
 
-Unknown_8e55e: ; 8e55e
+.OAMData_78
 	db 7
 	dsprite  1,  0, -2,  0, $00, $00
 	dsprite  0,  0, -2,  0, $01, $00
@@ -1433,9 +1495,8 @@
 	dsprite -2,  0, -1,  0, $04, $00
 	dsprite -2,  0,  0,  0, $05, $00
 	dsprite -2,  0,  1,  0, $06, $00
-; 8e57b
 
-Unknown_8e57b: ; 8e57b
+.OAMData_7a
 	db 8
 	dsprite -1,  0, -2,  0, $00, $00
 	dsprite -1,  0, -1,  0, $01, $00
@@ -1445,9 +1506,8 @@
 	dsprite  0,  0, -1,  0, $01, $40
 	dsprite  0,  0,  0,  0, $01, $60
 	dsprite  0,  0,  1,  0, $00, $60
-; 8e59c
 
-Unknown_8e59c: ; 8e59c
+.OAMData_7b
 	db 12
 	dsprite -3,  0, -1,  0, $00, $00
 	dsprite -2,  0, -1,  0, $01, $00
@@ -1461,9 +1521,8 @@
 	dsprite  0,  0,  0,  0, $02, $60
 	dsprite  1,  0,  0,  0, $01, $60
 	dsprite  2,  0,  0,  0, $00, $60
-; 8e5cd
 
-Unknown_8e5cd: ; 8e5cd
+.OAMData_7c
 	db 20
 	dsprite -3,  4, -2,  0, $00, $00
 	dsprite -3,  4, -1,  0, $01, $00
@@ -1485,9 +1544,8 @@
 	dsprite  1,  4, -1,  0, $11, $00
 	dsprite  1,  4,  0,  0, $12, $00
 	dsprite  1,  4,  1,  0, $13, $00
-; 8e61e
 
-Unknown_8e61e: ; 8e61e
+.OAMData_7e
 	db 20
 	dsprite  0,  0,   1,  0, $00, $81
 	dsprite  1,  0,   2,  0, $00, $81
@@ -1509,17 +1567,15 @@
 	dsprite  1,  0, -14,  0, $00, $81
 	dsprite  2,  0, -13,  0, $00, $81
 	dsprite  3,  0, -12,  0, $00, $81
-; 8e66f
 
-Unknown_8e66f: ; 8e66f
+.OAMData_7f
 	db 4
 	dsprite -1,  0, -1,  0, $00, $02
 	dsprite -1,  0,  0,  0, $01, $02
 	dsprite  0,  0, -1,  0, $02, $02
 	dsprite  0,  0,  0,  0, $03, $02
-; 8e680
 
-Unknown_8e680: ; 8e680
+.OAMData_81
 	db 9
 	dsprite -2,  0, -2,  4, $00, $01
 	dsprite -2,  0, -1,  4, $01, $01
@@ -1530,9 +1586,8 @@
 	dsprite  0,  0, -2,  4, $20, $01
 	dsprite  0,  0, -1,  4, $21, $01
 	dsprite  0,  0,  0,  4, $22, $01
-; 8e6a5
 
-Unknown_8e6a5: ; 8e6a5
+.OAMData_84
 	db 24
 	dsprite -5,  0, -2,  4, $00, $01
 	dsprite -5,  0, -1,  4, $01, $01
@@ -1569,5 +1624,6 @@
 	dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
 	dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
 	dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
+
 .deleted
 ; 8e72a (23:672a)
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -313,7 +313,6 @@
 
 .delete
 	call DeinitializeSprite
-
 .done
 	and a
 	ret