sprite animation data

2 files changed, 167 insertions, 70 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 72c6bc0b3..8b98b6930 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -420799,7 +420799,7 @@ _08148030: .4byte 0x03005f30
 _08148034: .4byte 0x02020004
 _08148038: .4byte SpriteCallbackDummy
 _0814803C: .4byte 0x03005f28
-_08148040: .4byte gUnknown_084120EC
+_08148040: .4byte gSpriteAffineAnimTable_84120EC
 	thumb_func_end sub_8147F84
 
 	thumb_func_start sub_8148044
@@ -420903,7 +420903,7 @@ sub_81480B4: @ 81480B4
 	bx r1
 	.align 2, 0
 _081480FC: .4byte 0x02020004
-_08148100: .4byte gUnknown_084121A0
+_08148100: .4byte gSpriteAffineAnimTable_84121A0
 _08148104: .4byte SpriteCallbackDummy
 	thumb_func_end sub_81480B4
 
@@ -420941,7 +420941,7 @@ sub_8148108: @ 8148108
 	b _08148158
 	.align 2, 0
 _08148148: .4byte 0x02020004
-_0814814C: .4byte gUnknown_084121A4
+_0814814C: .4byte gSpriteAffineAnimTable_84121A4
 _08148150:
 	mov r0, r8
 	adds r0, 0x10
@@ -420961,7 +420961,7 @@ _08148158:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08148174: .4byte gUnknown_084121A8
+_08148174: .4byte gSpriteAffineAnimTable_84121A8
 _08148178: .4byte 0x02020004
 	thumb_func_end sub_8148108
 
@@ -421283,7 +421283,7 @@ _0814847A:
 _081484A4: .4byte gUnknown_08411A10
 _081484A8: .4byte 0x03005f30
 _081484AC: .4byte 0x03005f20
-_081484B0: .4byte gUnknown_08412050
+_081484B0: .4byte gSpriteAffineAnimTable_8412050
 _081484B4: .4byte 0x03005f3c
 _081484B8: .4byte 0x03005f28
 _081484BC:
diff --git a/data/data2.s b/data/data2.s
index 830a4d248..e13b136ab 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -27825,58 +27825,126 @@ gUnknown_08411A10:: @ 8411A10
 	.incbin "baserom.gba", 0x00411a10, 0x32
 
 gUnknown_08411A42:: @ 8411A42
-Unknown_8411A42:
-	.incbin "baserom.gba", 0x00411A42, 0x44e
-Unknown_8411E90:
-	.incbin "baserom.gba", 0x00411E90, 0x10
-Unknown_8411EA0:
-	.incbin "baserom.gba", 0x00411EA0, 0x20
-Unknown_8411EC0:
-	.incbin "baserom.gba", 0x00411EC0, 0x28
-Unknown_8411EE8:
-	.incbin "baserom.gba", 0x00411EE8, 0x20
-Unknown_8411F08:
-	.incbin "baserom.gba", 0x00411F08, 0x28
-Unknown_8411F30:
-	.incbin "baserom.gba", 0x00411F30, 0x20
-Unknown_8411F50:
-	.incbin "baserom.gba", 0x00411F50, 0x28
-Unknown_8411F78:
-	.incbin "baserom.gba", 0x00411F78, 0x20
-Unknown_8411F98:
-	.incbin "baserom.gba", 0x00411F98, 0x28
-Unknown_8411FC0:
-	.incbin "baserom.gba", 0x00411FC0, 0x20
-Unknown_8411FE0:
-	.incbin "baserom.gba", 0x00411FE0, 0x28
-Unknown_8412008:
-	.incbin "baserom.gba", 0x00412008, 0x20
-Unknown_8412028:
-	.incbin "baserom.gba", 0x00412028, 0x28
-
-	.align 2
-gUnknown_08412050:: @ 8412050
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411EA0
-	.4byte Unknown_8411EE8
-	.4byte Unknown_8411F30
-	.4byte Unknown_8411F78
-	.4byte Unknown_8411FC0
-	.4byte Unknown_8412008
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411EC0
-	.4byte Unknown_8411F08
-	.4byte Unknown_8411F50
-	.4byte Unknown_8411F98
-	.4byte Unknown_8411FE0
-	.4byte Unknown_8412028
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
-	.4byte Unknown_8411E90
+	.incbin "baserom.gba", 0x00411A42, 0x44c
+
+	.align 2
+gSpriteAffineAnim_8411E90:: @ 8411E90
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411EA0:: @ 8411EA0
+	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 30
+	obj_rot_scal_anim_frame 0x0, 0x0, -12, 1
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411EC0:: @ 8411EC0
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 28
+	obj_rot_scal_anim_frame 0x0, 0x0, -4, 3
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411EE8:: @ 8411EE8
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411F08:: @ 8411F08
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411F30:: @ 8411F30
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411F50:: @ 8411F50
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411F78:: @ 8411F78
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411F98:: @ 8411F98
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411FC0:: @ 8411FC0
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8411FE0:: @ 8411FE0
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8412008:: @ 8412008
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_8412028:: @ 8412028
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
+	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnimTable_8412050:: @ 8412050
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411EA0
+	.4byte gSpriteAffineAnim_8411EE8
+	.4byte gSpriteAffineAnim_8411F30
+	.4byte gSpriteAffineAnim_8411F78
+	.4byte gSpriteAffineAnim_8411FC0
+	.4byte gSpriteAffineAnim_8412008
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411EC0
+	.4byte gSpriteAffineAnim_8411F08
+	.4byte gSpriteAffineAnim_8411F50
+	.4byte gSpriteAffineAnim_8411F98
+	.4byte gSpriteAffineAnim_8411FE0
+	.4byte gSpriteAffineAnim_8412028
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
+	.4byte gSpriteAffineAnim_8411E90
 
 	.align 2
 gUnknown_084120A4:: @ 84120A4
@@ -27894,26 +27962,55 @@ gUnknown_084120A4:: @ 84120A4
 	.4byte gUnknown_08E782c0
 	.4byte gUnknown_08E782d4
 	.4byte gUnknown_08E782e8
-Unknown_84120DC:
-	.incbin "baserom.gba", 0x004120dc, 0x10
 
 	.align 2
-gUnknown_084120EC:: @ 84120EC
-Unknown_8412EC:
-	.4byte Unknown_84120DC
-Unknown_84120F0:
-	.incbin "baserom.gba", 0x004120f0, 0xb0
+gSpriteAffineAnim_84120DC:: @ 84120DC
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_end
 
 	.align 2
-gUnknown_084121A0:: @ 84121A0
-	.4byte Unknown_84120DC
+gSpriteAffineAnimTable_84120EC:: @ 84120EC
+	.4byte gSpriteAffineAnim_84120DC
 
 	.align 2
-gUnknown_084121A4:: @ 84121A4
-	.4byte Unknown_84120F0
+gSpriteAffineAnim_84120F0:: @ 84120F0
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_end
 
-gUnknown_084121A8:: @ 84121A8
-	.incbin "baserom.gba", 0x004121a8, 0x4
+	.align 2
+gSpriteAffineAnim_8412148:: @ 8412148
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
+	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
+	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnimTable_84121A0:: @ 84121A0
+	.4byte gSpriteAffineAnim_84120DC
+
+	.align 2
+gSpriteAffineAnimTable_84121A4:: @ 84121A4
+	.4byte gSpriteAffineAnim_84120F0
+
+	.align 2
+gSpriteAffineAnimTable_84121A8:: @ 84121A8
+	.4byte gSpriteAffineAnim_8412148
 
 	.align 2
 gOamData_84121AC:: @ 84121AC