summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-14 16:43:18 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-11-14 16:43:18 -0500
commit1c093a2c81d1347ba26668b0900c82e9947b3d60 (patch)
treebd254c7f1bc083d9ffe0485d58ea6aebc14f17b9
parent492e963c9605f3bbcfdb5860fdface5bb913b7d5 (diff)
More data dism
-rw-r--r--asm/fire.s4
-rw-r--r--baserom.ipsbin293301 -> 287971 bytes
-rw-r--r--data/battle_anim_effects_misc.s1452
3 files changed, 1213 insertions, 243 deletions
diff --git a/asm/fire.s b/asm/fire.s
index efdfc8315..eee80228c 100644
--- a/asm/fire.s
+++ b/asm/fire.s
@@ -1281,7 +1281,7 @@ _080AD2C2:
muls r1, r3
lsls r1, 16
asrs r1, 16
- ldr r0, _080AD328 @ =gUnknown_83E5E46
+ ldr r0, _080AD328 @ =gUnknown_83E5E44 + 2
adds r2, r0
movs r3, 0
ldrsh r2, [r2, r3]
@@ -1319,7 +1319,7 @@ _080AD318: .4byte gUnknown_83E5E2C
_080AD31C: .4byte gSprites
_080AD320: .4byte 0x000003ff
_080AD324: .4byte 0xfffffc00
-_080AD328: .4byte gUnknown_83E5E46
+_080AD328: .4byte gUnknown_83E5E44 + 2
_080AD32C: .4byte gTasks+0x8
thumb_func_end sub_80AD1F8
diff --git a/baserom.ips b/baserom.ips
index 84bef65e7..1bb7dc529 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s
index a6f95e83d..14e5d514b 100644
--- a/data/battle_anim_effects_misc.s
+++ b/data/battle_anim_effects_misc.s
@@ -124,31 +124,49 @@ gUnknown_83E2B00:: @ 83E2B00
spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC
gUnknown_83E2B18:: @ 83E2B18
- .incbin "baserom.gba", 0x3E2B18, 0x14
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E2B20:: @ 83E2B20
+ obj_image_anim_frame 4, 7
+ obj_image_anim_frame 8, 7
+ obj_image_anim_jump 0
gUnknown_83E2B2C:: @ 83E2B2C
- .incbin "baserom.gba", 0x3E2B2C, 0x8
+ .4byte gUnknown_83E2B18
+ .4byte gUnknown_83E2B20
gUnknown_83E2B34:: @ 83E2B34
spr_template 10006, 10006, gOamData_83AC9D0, gUnknown_83E2B2C, NULL, gDummySpriteAffineAnimTable, sub_80A26F0
gUnknown_83E2B4C:: @ 83E2B4C
- .incbin "baserom.gba", 0x3E2B4C, 0x10
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E2B54:: @ 83E2B54
+ obj_image_anim_frame 4, 7
+ obj_image_anim_end
gUnknown_83E2B5C:: @ 83E2B5C
- .incbin "baserom.gba", 0x3E2B5C, 0x8
+ .4byte gUnknown_83E2B4C
+ .4byte gUnknown_83E2B54
gUnknown_83E2B64:: @ 83E2B64
spr_template 10158, 10158, gOamData_83AC9D0, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0
gUnknown_83E2B7C:: @ 83E2B7C
- .incbin "baserom.gba", 0x3E2B7C, 0x10
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E2B84:: @ 83E2B84
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
gUnknown_83E2B8C:: @ 83E2B8C
- .incbin "baserom.gba", 0x3E2B8C, 0x4
+ .4byte gUnknown_83E2B7C
gUnknown_83E2B90:: @ 83E2B90
- .incbin "baserom.gba", 0x3E2B90, 0x4
+ .4byte gUnknown_83E2B84
gUnknown_83E2B94:: @ 83E2B94
spr_template 10159, 10159, gOamData_83AC9D0, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920
@@ -157,10 +175,27 @@ gUnknown_83E2BAC:: @ 83E2BAC
spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC
gUnknown_83E2BC4:: @ 83E2BC4
- .incbin "baserom.gba", 0x3E2BC4, 0x3C
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 4, 5
+ obj_image_anim_frame 8, 5
+ obj_image_anim_frame 12, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 20, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 12, 5
+ obj_image_anim_frame 8, 5
+ obj_image_anim_frame 4, 5
+ obj_image_anim_jump 0
+
+gUnknown_83E2BF0:: @ 83E2BF0
+ obj_image_anim_frame 24, 5
+ obj_image_anim_frame 28, 5
+ obj_image_anim_frame 32, 5
+ obj_image_anim_end
gUnknown_83E2C00:: @ 83E2C00
- .incbin "baserom.gba", 0x3E2C00, 0x8
+ .4byte gUnknown_83E2BC4
+ .4byte gUnknown_83E2BF0
gUnknown_83E2C08:: @ 83E2C08
spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4
@@ -169,49 +204,112 @@ gUnknown_83E2C20:: @ 83E2C20
spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle
gUnknown_83E2C38:: @ 83E2C38
- .incbin "baserom.gba", 0x3E2C38, 0x14
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_jump 0
gUnknown_83E2C4C:: @ 83E2C4C
- .incbin "baserom.gba", 0x3E2C4C, 0x4
+ .4byte gUnknown_83E2C38
gUnknown_83E2C50:: @ 83E2C50
spr_template 10160, 10160, gOamData_83AC9F8, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C
gUnknown_83E2C68:: @ 83E2C68
- .incbin "baserom.gba", 0x3E2C68, 0x10
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E2C78:: @ 83E2C78
- .incbin "baserom.gba", 0x3E2C78, 0x4
+ .4byte gUnknown_83E2C68
gUnknown_83E2C7C:: @ 83E2C7C
spr_template 10174, 10174, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C
gUnknown_83E2C94:: @ 83E2C94
- .incbin "baserom.gba", 0x3E2C94, 0x28
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 64, 4
+ obj_image_anim_frame 96, 4
+ obj_image_anim_end
+
+gUnknown_83E2CA8:: @ 83E2CA8
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 64, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 96, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E2CBC:: @ 83E2CBC
- .incbin "baserom.gba", 0x3E2CBC, 0x48
+ .4byte gUnknown_83E2C94
+ .4byte gUnknown_83E2CA8
+
+gUnknown_83E2CC4:: @ 83E2CC4
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame -11, 0, 0, 6
+ obj_rot_scal_anim_frame 11, 0, 0, 6
+ obj_rot_scal_anim_end
+
+gUnknown_83E2CE4:: @ 83E2CE4
+ obj_rot_scal_anim_frame -256, 256, 0, 0
+ obj_rot_scal_anim_frame 11, 0, 0, 6
+ obj_rot_scal_anim_frame -11, 0, 0, 6
+ obj_rot_scal_anim_end
gUnknown_83E2D04:: @ 83E2D04
- .incbin "baserom.gba", 0x3E2D04, 0x8
+ .4byte gUnknown_83E2CC4
+ .4byte gUnknown_83E2CE4
gUnknown_83E2D0C:: @ 83E2D0C
spr_template 10186, 10186, gOamData_83ACA60, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28
gUnknown_83E2D24:: @ 83E2D24
- .incbin "baserom.gba", 0x3E2D24, 0x28
+ obj_rot_scal_anim_frame 0, 0, 0, 0
+ obj_rot_scal_anim_frame 48, 48, 0, 14
+ obj_rot_scal_anim_end
+
+gUnknown_83E2D3C:: @ 83E2D3C
+ obj_rot_scal_anim_frame -16, -16, 0, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E2D4C:: @ 83E2D4C
- .incbin "baserom.gba", 0x3E2D4C, 0x8
+ .4byte gUnknown_83E2D24
+ .4byte gUnknown_83E2D3C
gUnknown_83E2D54:: @ 83E2D54
spr_template 10147, 10147, gOamData_83ACA90, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098
gUnknown_83E2D6C:: @ 83E2D6C
- .incbin "baserom.gba", 0x3E2D6C, 0x48
+ obj_image_anim_frame 0, 7
+ obj_image_anim_frame 16, 7
+ obj_image_anim_frame 32, 7
+ obj_image_anim_frame 48, 7
+ obj_image_anim_end
+
+gUnknown_83E2D80:: @ 83E2D80
+ obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 48, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E2D94:: @ 83E2D94
+ obj_image_anim_frame 0, 7
+ obj_image_anim_frame 16, 7
+ obj_image_anim_frame 32, 7
+ obj_image_anim_end
+
+gUnknown_83E2DA4:: @ 83E2DA4
+ obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E2DB4:: @ 83E2DB4
- .incbin "baserom.gba", 0x3E2DB4, 0x10
+ .4byte gUnknown_83E2D6C
+ .4byte gUnknown_83E2D80
+ .4byte gUnknown_83E2D94
+ .4byte gUnknown_83E2DA4
gUnknown_83E2DC4:: @ 83E2DC4
spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168
@@ -220,22 +318,41 @@ gUnknown_83E2DDC:: @ 83E2DDC
spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC
gUnknown_83E2DF4:: @ 83E2DF4
- .incbin "baserom.gba", 0x3E2DF4, 0xC
+ obj_image_anim_frame 3, 3
+ obj_image_anim_frame 0, 5
+ obj_image_anim_jump 0
gUnknown_83E2E00:: @ 83E2E00
- .incbin "baserom.gba", 0x3E2E00, 0x4
+ .4byte gUnknown_83E2DF4
gUnknown_83E2E04:: @ 83E2E04
spr_template 10147, 10147, gOamData_83AC9C8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334
gUnknown_83E2E1C:: @ 83E2E1C
- .incbin "baserom.gba", 0x3E2E1C, 0x8
+ obj_image_anim_frame 0, 30
+ obj_image_anim_end
gUnknown_83E2E24:: @ 83E2E24
- .incbin "baserom.gba", 0x3E2E24, 0x5C
+ .4byte gUnknown_83E2E1C
+
+gUnknown_83E2E28:: @ 83E2E28
+ obj_rot_scal_anim_frame 0, 0, 252, 10
+ obj_rot_scal_anim_frame 0, 0, 4, 20
+ obj_rot_scal_anim_frame 0, 0, 252, 10
+ obj_rot_scal_anim_end
+
+gUnknown_83E2E48:: @ 83E2E48
+ obj_rot_scal_anim_frame 0, 0, 255, 2
+ obj_rot_scal_anim_frame 0, 0, 1, 4
+ obj_rot_scal_anim_frame 0, 0, 255, 4
+ obj_rot_scal_anim_frame 0, 0, 1, 4
+ obj_rot_scal_anim_frame 0, 0, 255, 4
+ obj_rot_scal_anim_frame 0, 0, 1, 2
+ obj_rot_scal_anim_end
gUnknown_83E2E80:: @ 83E2E80
- .incbin "baserom.gba", 0x3E2E80, 0x8
+ .4byte gUnknown_83E2E28
+ .4byte gUnknown_83E2E48
gUnknown_83E2E88:: @ 83E2E88
spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518
@@ -244,10 +361,14 @@ gUnknown_83E2EA0:: @ 83E2EA0
spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4
gUnknown_83E2EB8:: @ 83E2EB8
- .incbin "baserom.gba", 0x3E2EB8, 0x14
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 4, 4
+ obj_image_anim_frame 8, 4
+ obj_image_anim_frame 12, 4
+ obj_image_anim_end
gUnknown_83E2ECC:: @ 83E2ECC
- .incbin "baserom.gba", 0x3E2ECC, 0x4
+ .4byte gUnknown_83E2EB8
gUnknown_83E2ED0:: @ 83E2ED0
spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670
@@ -256,28 +377,79 @@ gUnknown_83E2EE8:: @ 83E2EE8
spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4
gUnknown_83E2F00:: @ 83E2F00
- .incbin "baserom.gba", 0x3E2F00, 0x50
+ obj_rot_scal_anim_frame 0, 0, 0, 3
+ obj_rot_scal_anim_end
+
+gUnknown_83E2F10:: @ 83E2F10
+ obj_rot_scal_anim_frame 0, -10, 0, 3
+ obj_rot_scal_anim_frame 0, -6, 0, 3
+ obj_rot_scal_anim_frame 0, -2, 0, 3
+ obj_rot_scal_anim_frame 0, 0, 0, 3
+ obj_rot_scal_anim_frame 0, 2, 0, 3
+ obj_rot_scal_anim_frame 0, 6, 0, 3
+ obj_rot_scal_anim_frame 0, 10, 0, 3
+ obj_rot_scal_anim_end
gUnknown_83E2F50:: @ 83E2F50
- .incbin "baserom.gba", 0x3E2F50, 0x10
+ .4byte gUnknown_83E2F00
+ .4byte gUnknown_83E2F10
+ .4byte gUnknown_83E2E28
+ .4byte gUnknown_83E2E48
gUnknown_83E2F60:: @ 83E2F60
spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC
gUnknown_83E2F78:: @ 83E2F78
- .incbin "baserom.gba", 0x3E2F78, 0x5C
+ .byte 0x05, 0x18, 0x01, 0x00, 0x04, 0x00, 0x08, 0x10, 0xff, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00
+ .byte 0x7f, 0x00, 0x00, 0x00
+
+gUnknown_83E2F9C:: @ 83E2F9C
+ obj_image_anim_frame 28, 1
+ obj_image_anim_end
+
+gUnknown_83E2FA4:: @ 83E2FA4
+ obj_image_anim_frame 32, 1
+ obj_image_anim_end
+
+gUnknown_83E2FAC:: @ 83E2FAC
+ obj_image_anim_frame 20, 1
+ obj_image_anim_end
+
+gUnknown_83E2FB4:: @ 83E2FB4
+ obj_image_anim_frame 28, 1, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E2FBC:: @ 83E2FBC
+ obj_image_anim_frame 16, 1
+ obj_image_anim_end
+
+gUnknown_83E2FC4:: @ 83E2FC4
+ obj_image_anim_frame 16, 1, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E2FCC:: @ 83E2FCC
+ obj_image_anim_frame 28, 1
+ obj_image_anim_end
gUnknown_83E2FD4:: @ 83E2FD4
- .incbin "baserom.gba", 0x3E2FD4, 0x1C
+ .4byte gUnknown_83E2F9C
+ .4byte gUnknown_83E2FA4
+ .4byte gUnknown_83E2FAC
+ .4byte gUnknown_83E2FB4
+ .4byte gUnknown_83E2FBC
+ .4byte gUnknown_83E2FC4
+ .4byte gUnknown_83E2FCC
gUnknown_83E2FF0:: @ 83E2FF0
spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E3008:: @ 83E3008
- .incbin "baserom.gba", 0x3E3008, 0x18
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 4, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E3020:: @ 83E3020
- .incbin "baserom.gba", 0x3E3020, 0x4
+ .4byte gUnknown_83E3008
gUnknown_83E3024:: @ 83E3024
spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040
@@ -286,16 +458,28 @@ gUnknown_83E303C:: @ 83E303C
spr_template 10159, 10159, gOamData_83ACA30, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040
gUnknown_83E3054:: @ 83E3054
- .incbin "baserom.gba", 0x3E3054, 0x48
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 246, 1
+ obj_rot_scal_anim_jump 1
+
+gUnknown_83E306C:: @ 83E306C
+ obj_rot_scal_anim_frame 192, 192, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 244, 1
+ obj_rot_scal_anim_jump 1
+
+gUnknown_83E3084:: @ 83E3084
+ obj_rot_scal_anim_frame 143, 143, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 241, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E309C:: @ 83E309C
- .incbin "baserom.gba", 0x3E309C, 0x4
+ .4byte gUnknown_83E3054
gUnknown_83E30A0:: @ 83E30A0
- .incbin "baserom.gba", 0x3E30A0, 0x4
+ .4byte gUnknown_83E306C
gUnknown_83E30A4:: @ 83E30A4
- .incbin "baserom.gba", 0x3E30A4, 0x4
+ .4byte gUnknown_83E3084
gUnknown_83E30A8:: @ 83E30A8
spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040
@@ -307,16 +491,28 @@ gUnknown_83E30D8:: @ 83E30D8
spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040
gUnknown_83E30F0:: @ 83E30F0
- .incbin "baserom.gba", 0x3E30F0, 0x10
+ .2byte 0x001f, 0x027f, 0x03ff, 0x03e0, 0x7dc5, 0x7d56, 0x7eb6, 0x0000
gUnknown_83E3100:: @ 83E3100
spr_template 10266, 10266, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298
gUnknown_83E3118:: @ 83E3118
- .incbin "baserom.gba", 0x3E3118, 0x28
+ obj_image_anim_frame 64, 3
+ obj_image_anim_frame 80, 3
+ obj_image_anim_frame 96, 3
+ obj_image_anim_frame 112, 6
+ obj_image_anim_end
+
+gUnknown_83E312C:: @ 83E312C
+ obj_image_anim_frame 64, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 80, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 96, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 112, 6, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E3140:: @ 83E3140
- .incbin "baserom.gba", 0x3E3140, 0x8
+ .4byte gUnknown_83E3118
+ .4byte gUnknown_83E312C
gUnknown_83E3148:: @ 83E3148
spr_template 10056, 10056, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
@@ -325,10 +521,17 @@ gUnknown_83E3160:: @ 83E3160
spr_template 10287, 10287, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
gUnknown_83E3178:: @ 83E3178
- .incbin "baserom.gba", 0x3E3178, 0x118
+ .incbin "baserom.gba", 0x3E3178, 0x104
+
+gUnknown_83E327C:: @ 83E327C
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 32, 5
+ obj_image_anim_frame 48, 5
+ obj_image_anim_end
gUnknown_83E3290:: @ 83E3290
- .incbin "baserom.gba", 0x3E3290, 0x4
+ .4byte gUnknown_83E327C
gUnknown_83E3294:: @ 83E3294
spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0
@@ -343,19 +546,37 @@ gUnknown_83E3354:: @ 83E3354
spr_template 10280, 10280, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0
gUnknown_83E336C:: @ 83E336C
- .incbin "baserom.gba", 0x3E336C, 0x40
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E337C:: @ 83E337C
+ obj_rot_scal_anim_frame 0, 0, 2, 12
+ obj_rot_scal_anim_frame 0, 0, 0, 6
+ obj_rot_scal_anim_frame 0, 0, 254, 24
+ obj_rot_scal_anim_frame 0, 0, 0, 6
+ obj_rot_scal_anim_frame 0, 0, 2, 12
+ obj_rot_scal_anim_jump 0
gUnknown_83E33AC:: @ 83E33AC
- .incbin "baserom.gba", 0x3E33AC, 0x8
+ .4byte gUnknown_83E336C
+ .4byte gUnknown_83E337C
gUnknown_83E33B4:: @ 83E33B4
spr_template 10099, 10099, gOamData_83ACB58, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC
gUnknown_83E33CC:: @ 83E33CC
- .incbin "baserom.gba", 0x3E33CC, 0x24
+ obj_image_anim_frame 0, 7
+ obj_image_anim_frame 16, 7
+ obj_image_anim_frame 32, 7
+ obj_image_anim_frame 48, 7
+ obj_image_anim_frame 64, 7
+ obj_image_anim_frame 80, 7
+ obj_image_anim_frame 96, 7
+ obj_image_anim_frame 112, 7
+ obj_image_anim_jump 0
gUnknown_83E33F0:: @ 83E33F0
- .incbin "baserom.gba", 0x3E33F0, 0x4
+ .4byte gUnknown_83E33CC
gUnknown_83E33F4:: @ 83E33F4
spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C
@@ -364,13 +585,34 @@ gUnknown_83E340C:: @ 83E340C
spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C
gUnknown_83E3424:: @ 83E3424
- .incbin "baserom.gba", 0x3E3424, 0x70
+ .incbin "baserom.gba", 0x3E3424, 0x68
+
+gUnknown_83E348C:: @ 83E348C
+ obj_image_anim_frame 0, 40
+ obj_image_anim_end
gUnknown_83E3494:: @ 83E3494
- .incbin "baserom.gba", 0x3E3494, 0x64
+ .4byte gUnknown_83E348C
+
+gUnknown_83E3498:: @ 83E3498
+ obj_rot_scal_anim_frame 20, 20, 226, 0
+ obj_rot_scal_anim_frame 8, 8, 1, 24
+ obj_rot_scal_anim_end
+
+gUnknown_83E34B0:: @ 83E34B0
+ .incbin "baserom.gba", 0x3E34B0, 0x18
+
+gUnknown_83E34C8:: @ 83E34C8
+ obj_rot_scal_anim_frame 20, 20, 30, 0
+ obj_rot_scal_anim_frame 8, 8, 255, 24
+ obj_rot_scal_anim_end
+
+gUnknown_83E34E0:: @ 83E34E0
+ .incbin "baserom.gba", 0x3E34E0, 0x18
gUnknown_83E34F8:: @ 83E34F8
- .incbin "baserom.gba", 0x3E34F8, 0x8
+ .4byte gUnknown_83E3498
+ .4byte gUnknown_83E34C8
gUnknown_83E3500:: @ 83E3500
spr_template 10228, 10228, gOamData_83ACA38, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4
@@ -382,17 +624,26 @@ gUnknown_83E3530:: @ 83E3530
spr_template 10014, 10014, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298
gUnknown_83E3548:: @ 83E3548
- .incbin "baserom.gba", 0x3E3548, 0x8
+ .byte 0x40, 0x40, 0x00, 0xc0, 0xc0, 0x40, 0x20, 0xe0
gUnknown_83E3550:: @ 83E3550
spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5340
spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5590
gUnknown_83E3580:: @ 83E3580
- .incbin "baserom.gba", 0x3E3580, 0x1C
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 48, 4
+ obj_image_anim_end
+
+gUnknown_83E3594:: @ 83E3594
+ obj_image_anim_frame 48, 4
+ obj_image_anim_end
gUnknown_83E359C:: @ 83E359C
- .incbin "baserom.gba", 0x3E359C, 0x8
+ .4byte gUnknown_83E3580
+ .4byte gUnknown_83E3594
gUnknown_83E35A4:: @ 83E35A4
spr_template 10183, 10183, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940
@@ -404,19 +655,37 @@ gUnknown_83E35D4:: @ 83E35D4
spr_template 10286, 10286, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0
gUnknown_83E35EC:: @ 83E35EC
- .incbin "baserom.gba", 0x3E35EC, 0x14
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 8, 12
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 24, 4
+ obj_image_anim_end
gUnknown_83E3600:: @ 83E3600
- .incbin "baserom.gba", 0x3E3600, 0x4
+ .4byte gUnknown_83E35EC
gUnknown_83E3604:: @ 83E3604
spr_template 10184, 10184, gOamData_83ACA18, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8
gUnknown_83E361C:: @ 83E361C
- .incbin "baserom.gba", 0x3E361C, 0x3C
+ obj_image_anim_frame 0, 18
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 18
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 32, 18
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 32, 6
+ obj_image_anim_frame 48, 18
+ obj_image_anim_frame 32, 6
+ obj_image_anim_frame 48, 6
+ obj_image_anim_frame 64, 18
+ obj_image_anim_frame 48, 6
+ obj_image_anim_frame 64, 54
+ obj_image_anim_end
gUnknown_83E3658:: @ 83E3658
- .incbin "baserom.gba", 0x3E3658, 0x4
+ .4byte gUnknown_83E361C
gUnknown_83E365C:: @ 83E365C
spr_template 10185, 10185, gOamData_83AC9D8, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C
@@ -425,31 +694,48 @@ gUnknown_83E3674:: @ 83E3674
spr_template 10017, 10017, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E368C:: @ 83E368C
- .incbin "baserom.gba", 0x3E368C, 0x18
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 16, 3
+ obj_image_anim_frame 32, 3
+ obj_image_anim_frame 48, 3
+ obj_image_anim_frame 64, 3
+ obj_image_anim_end
gUnknown_83E36A4:: @ 83E36A4
- .incbin "baserom.gba", 0x3E36A4, 0x4
+ .4byte gUnknown_83E368C
gUnknown_83E36A8:: @ 83E36A8
spr_template 10030, 10030, gOamData_83AC9D8, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E36C0:: @ 83E36C0
- .incbin "baserom.gba", 0x3E36C0, 0x14
+ obj_image_anim_frame 3, 5
+ obj_image_anim_frame 2, 5
+ obj_image_anim_frame 1, 5
+ obj_image_anim_frame 0, 5
+ obj_image_anim_end
gUnknown_83E36D4:: @ 83E36D4
- .incbin "baserom.gba", 0x3E36D4, 0x14
+ .4byte gUnknown_83E36C0
+
+gUnknown_83E36D8:: @ 83E36D8
+ obj_rot_scal_anim_frame 512, 512, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E36E8:: @ 83E36E8
- .incbin "baserom.gba", 0x3E36E8, 0x4
+ .4byte gUnknown_83E36D8
gUnknown_83E36EC:: @ 83E36EC
spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68
gUnknown_83E3704:: @ 83E3704
- .incbin "baserom.gba", 0x3E3704, 0x14
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 1, 5
+ obj_image_anim_frame 2, 5
+ obj_image_anim_frame 3, 5
+ obj_image_anim_end
gUnknown_83E3718:: @ 83E3718
- .incbin "baserom.gba", 0x3E3718, 0x4
+ .4byte gUnknown_83E3704
gUnknown_83E371C:: @ 83E371C
spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C
@@ -458,19 +744,31 @@ gUnknown_83E3734:: @ 83E3734
spr_template 10194, 10194, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0
gUnknown_83E374C:: @ 83E374C
- .incbin "baserom.gba", 0x3E374C, 0x14
+ obj_image_anim_frame 0, 8
+ obj_image_anim_frame 4, 8
+ obj_image_anim_frame 8, 8
+ obj_image_anim_frame 12, 8
+ obj_image_anim_jump 0
gUnknown_83E3760:: @ 83E3760
- .incbin "baserom.gba", 0x3E3760, 0x4
+ .4byte gUnknown_83E374C
gUnknown_83E3764:: @ 83E3764
spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40
gUnknown_83E377C:: @ 83E377C
- .incbin "baserom.gba", 0x3E377C, 0x24
+ obj_image_anim_frame 0, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 48, 3
+ obj_image_anim_frame 64, 5
+ obj_image_anim_frame 80, 3
+ obj_image_anim_frame 96, 2
+ obj_image_anim_frame 0, 2
+ obj_image_anim_end
gUnknown_83E37A0:: @ 83E37A0
- .incbin "baserom.gba", 0x3E37A0, 0x4
+ .4byte gUnknown_83E377C
gUnknown_83E37A4:: @ 83E37A4
spr_template 10031, 10031, gOamData_83AC9D8, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
@@ -479,10 +777,14 @@ gUnknown_83E37BC:: @ 83E37BC
spr_template 10020, 10020, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244
gUnknown_83E37D4:: @ 83E37D4
- .incbin "baserom.gba", 0x3E37D4, 0x14
+ obj_image_anim_frame 0, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 48, 2
+ obj_image_anim_end
gUnknown_83E37E8:: @ 83E37E8
- .incbin "baserom.gba", 0x3E37E8, 0x4
+ .4byte gUnknown_83E37D4
gUnknown_83E37EC:: @ 83E37EC
spr_template 10192, 10192, gOamData_83AC9D8, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC
@@ -509,16 +811,23 @@ gUnknown_83E3844:: @ 83E3844
spr_template 14340, 2110, gOamData_83E380C, gUnknown_83E3814, gUnknown_83E381C, gUnknown_83E3824, gUnknown_83E382C
gUnknown_83E385C:: @ 83E385C
- .incbin "baserom.gba", 0x3E385C, 0x20
+ .4byte 0x83e3834
+ .4byte 0x83e383c
+
+gUnknown_83E3864:: @ 83E3864
+ obj_rot_scal_anim_frame 12, 12, 0, 16
+ obj_rot_scal_anim_frame -12, -12, 0, 16
+ obj_rot_scal_anim_jump 0
gUnknown_83E387C:: @ 83E387C
- .incbin "baserom.gba", 0x3E387C, 0x4
+ .4byte gUnknown_83E3864
gUnknown_83E3880:: @ 83E3880
spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4
gUnknown_83E3898:: @ 83E3898
- .incbin "baserom.gba", 0x3E3898, 0x30
+ .2byte 0x2758, 0x7fff, 0x735f, 0x6adf, 0x623f, 0x59bf, 0x2771, 0x7fff, 0x6bf9, 0x57f4, 0x43ef, 0x33ea, 0x27c9, 0x7fff, 0x63ff, 0x47ff
+ .2byte 0x2bff, 0x0fff, 0x27bf, 0x7fff, 0x7f9a, 0x7f55, 0x7f10, 0x7ecc
gUnknown_83E38C8:: @ 83E38C8
spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A68B0
@@ -527,28 +836,71 @@ gUnknown_83E38E0:: @ 83E38E0
spr_template 10193, 10193, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8
gUnknown_83E38F8:: @ 83E38F8
- .incbin "baserom.gba", 0x3E38F8, 0x18
+ obj_rot_scal_anim_frame 160, 160, 0, 0
+ obj_rot_scal_anim_frame 4, 4, 0, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E3910:: @ 83E3910
- .incbin "baserom.gba", 0x3E3910, 0x4
+ .4byte gUnknown_83E38F8
gUnknown_83E3914:: @ 83E3914
spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28
gUnknown_83E392C:: @ 83E392C
- .incbin "baserom.gba", 0x3E392C, 0x50
+ obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E3940:: @ 83E3940
+ obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E3954:: @ 83E3954
+ obj_image_anim_frame 0, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 48, 2
+ obj_image_anim_end
+
+gUnknown_83E3968:: @ 83E3968
+ obj_image_anim_frame 48, 2
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 0, 2
+ obj_image_anim_end
gUnknown_83E397C:: @ 83E397C
- .incbin "baserom.gba", 0x3E397C, 0x10
+ .4byte gUnknown_83E392C
+ .4byte gUnknown_83E3954
+ .4byte gUnknown_83E3940
+ .4byte gUnknown_83E3968
gUnknown_83E398C:: @ 83E398C
spr_template 10209, 10209, gOamData_83AC9D8, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64
gUnknown_83E39A4:: @ 83E39A4
- .incbin "baserom.gba", 0x3E39A4, 0x88
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 30, 30, 0, 8
+ obj_rot_scal_anim_end
+
+gUnknown_83E39BC:: @ 83E39BC
+ obj_rot_scal_anim_frame 0, 0, 4, 11
+ obj_rot_scal_anim_frame 0, 0, 252, 11
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_frame -30, -30, 0, 8
+ obj_rot_scal_anim_end
+
+gUnknown_83E39E4:: @ 83E39E4
+ .incbin "baserom.gba", 0x3E39E4, 0x48
gUnknown_83E3A2C:: @ 83E3A2C
- .incbin "baserom.gba", 0x3E3A2C, 0x8
+ .4byte gUnknown_83E39A4
+ .4byte gUnknown_83E39BC
gUnknown_83E3A34:: @ 83E3A34
spr_template 10064, 10064, gOamData_83ACA98, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08
@@ -557,29 +909,71 @@ gUnknown_83E3A4C:: @ 83E3A4C
spr_template 10064, 10064, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84
gUnknown_83E3A64:: @ 83E3A64
- .incbin "baserom.gba", 0x3E3A64, 0x50
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E3A6C:: @ 83E3A6C
+ obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E3A74:: @ 83E3A74
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_end
+
+gUnknown_83E3A94:: @ 83E3A94
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E3AB4:: @ 83E3AB4
- .incbin "baserom.gba", 0x3E3AB4, 0x10
+ .4byte gUnknown_83E3A64
+ .4byte gUnknown_83E3A6C
+ .4byte gUnknown_83E3A74
+ .4byte gUnknown_83E3A94
gUnknown_83E3AC4:: @ 83E3AC4
spr_template 10214, 10214, gOamData_83AC9D8, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90
spr_template 10064, 10064, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48
gUnknown_83E3AF4:: @ 83E3AF4
- .incbin "baserom.gba", 0x3E3AF4, 0xC4
+ .incbin "baserom.gba", 0x3E3AF4, 0xA0
+
+gUnknown_83E3B94:: @ 83E3B94
+ obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 8, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 24, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 40, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_loop 1
+ obj_image_anim_end
gUnknown_83E3BB8:: @ 83E3BB8
- .incbin "baserom.gba", 0x3E3BB8, 0x4
+ .4byte gUnknown_83E3B94
gUnknown_83E3BBC:: @ 83E3BBC
spr_template 10075, 10075, gOamData_83AC9F8, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8
gUnknown_83E3BD4:: @ 83E3BD4
- .incbin "baserom.gba", 0x3E3BD4, 0x20
+ obj_rot_scal_anim_frame 16, 256, 0, 0
+ obj_rot_scal_anim_frame 20, 0, 0, 12
+ obj_rot_scal_anim_frame 0, 0, 0, 32
+ obj_rot_scal_anim_end
gUnknown_83E3BF4:: @ 83E3BF4
- .incbin "baserom.gba", 0x3E3BF4, 0x4
+ .4byte gUnknown_83E3BD4
gUnknown_83E3BF8:: @ 83E3BF8
spr_template 10005, 10005, gOamData_83ACBA0, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C
@@ -591,13 +985,25 @@ gUnknown_83E3C28:: @ 83E3C28
spr_template 10003, 10003, gOamData_83ACB18, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4
gUnknown_83E3C40:: @ 83E3C40
- .incbin "baserom.gba", 0x3E3C40, 0x58
+ obj_rot_scal_anim_frame 32, 32, 0, 0
+ obj_rot_scal_anim_frame 7, 7, 0, 200
+ obj_rot_scal_anim_end
+
+gUnknown_83E3C58:: @ 83E3C58
+ obj_rot_scal_anim_frame 5, 5, 0, 10
+ obj_rot_scal_anim_frame -10, -10, 0, 10
+ obj_rot_scal_anim_frame 10, 10, 0, 10
+ obj_rot_scal_anim_frame -10, -10, 0, 10
+ obj_rot_scal_anim_frame 10, 10, 0, 10
+ obj_rot_scal_anim_frame -10, -10, 0, 10
+ obj_rot_scal_anim_frame 10, 10, 0, 10
+ obj_rot_scal_anim_end
gUnknown_83E3C98:: @ 83E3C98
- .incbin "baserom.gba", 0x3E3C98, 0x4
+ .4byte gUnknown_83E3C40
gUnknown_83E3C9C:: @ 83E3C9C
- .incbin "baserom.gba", 0x3E3C9C, 0x4
+ .4byte gUnknown_83E3C58
gUnknown_83E3CA0:: @ 83E3CA0
spr_template 10163, 10163, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
@@ -618,13 +1024,18 @@ gUnknown_83E3D18:: @ 83E3D18
spr_template 10178, 10178, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8
gUnknown_83E3D30:: @ 83E3D30
- .incbin "baserom.gba", 0x3E3D30, 0x8
+ obj_image_anim_frame 8, 1
+ obj_image_anim_end
gUnknown_83E3D38:: @ 83E3D38
- .incbin "baserom.gba", 0x3E3D38, 0x14
+ .4byte gUnknown_83E3D30
+
+gUnknown_83E3D3C:: @ 83E3D3C
+ obj_rot_scal_anim_frame 0, 0, 10, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E3D4C:: @ 83E3D4C
- .incbin "baserom.gba", 0x3E3D4C, 0x4
+ .4byte gUnknown_83E3D3C
gUnknown_83E3D50:: @ 83E3D50
spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88
@@ -633,37 +1044,60 @@ gUnknown_83E3D68:: @ 83E3D68
spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C
gUnknown_83E3D80:: @ 83E3D80
- .incbin "baserom.gba", 0x3E3D80, 0x10
+ obj_rot_scal_anim_frame 0, 0, 20, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E3D90:: @ 83E3D90
- .incbin "baserom.gba", 0x3E3D90, 0x4
+ .4byte gUnknown_83E3D80
gUnknown_83E3D94:: @ 83E3D94
spr_template 10006, 10006, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4
gUnknown_83E3DAC:: @ 83E3DAC
- .incbin "baserom.gba", 0x3E3DAC, 0x18
+ obj_rot_scal_anim_frame 16, 256, 0, 0
+ obj_rot_scal_anim_frame 4, 0, 0, 40
+ obj_rot_scal_anim_end
gUnknown_83E3DC4:: @ 83E3DC4
- .incbin "baserom.gba", 0x3E3DC4, 0x4
+ .4byte gUnknown_83E3DAC
gUnknown_83E3DC8:: @ 83E3DC8
spr_template 10009, 10009, gOamData_83ACA80, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04
gUnknown_83E3DE0:: @ 83E3DE0
- .incbin "baserom.gba", 0x3E3DE0, 0x20
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 16, 3
+ obj_image_anim_frame 32, 20
+ obj_image_anim_end
+
+gUnknown_83E3DF0:: @ 83E3DF0
+ obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 32, 20, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_end
gUnknown_83E3E00:: @ 83E3E00
- .incbin "baserom.gba", 0x3E3E00, 0x8
+ .4byte gUnknown_83E3DE0
+ .4byte gUnknown_83E3DF0
gUnknown_83E3E08:: @ 83E3E08
spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64
gUnknown_83E3E20:: @ 83E3E20
- .incbin "baserom.gba", 0x3E3E20, 0x20
+ obj_image_anim_frame 0, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 32, 1
+ obj_image_anim_end
+
+gUnknown_83E3E30:: @ 83E3E30
+ obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 32, 1, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_end
gUnknown_83E3E40:: @ 83E3E40
- .incbin "baserom.gba", 0x3E3E40, 0x8
+ .4byte gUnknown_83E3E20
+ .4byte gUnknown_83E3E30
gUnknown_83E3E48:: @ 83E3E48
spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14
@@ -672,19 +1106,36 @@ gUnknown_83E3E60:: @ 83E3E60
.incbin "baserom.gba", 0x3E3E60, 0x20
gUnknown_83E3E80:: @ 83E3E80
- .incbin "baserom.gba", 0x3E3E80, 0x48
+ .incbin "baserom.gba", 0x3E3E80, 0x20
+
+gUnknown_83E3EA0:: @ 83E3EA0
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 4, 40, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 12, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+gUnknown_83E3EB4:: @ 83E3EB4
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 4, 40
+ obj_image_anim_frame 8, 4
+ obj_image_anim_frame 12, 4
+ obj_image_anim_end
gUnknown_83E3EC8:: @ 83E3EC8
- .incbin "baserom.gba", 0x3E3EC8, 0x8
+ .4byte gUnknown_83E3EA0
+ .4byte gUnknown_83E3EB4
gUnknown_83E3ED0:: @ 83E3ED0
spr_template 10086, 10086, gOamData_83AC9D0, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C
gUnknown_83E3EE8:: @ 83E3EE8
- .incbin "baserom.gba", 0x3E3EE8, 0x18
+ obj_rot_scal_anim_frame 11, 11, 0, 8
+ obj_rot_scal_anim_frame -11, -11, 0, 8
+ obj_rot_scal_anim_end
gUnknown_83E3F00:: @ 83E3F00
- .incbin "baserom.gba", 0x3E3F00, 0x4
+ .4byte gUnknown_83E3EE8
gUnknown_83E3F04:: @ 83E3F04
spr_template 10087, 10087, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC
@@ -699,40 +1150,78 @@ gUnknown_83E3F64:: @ 83E3F64
spr_template 10197, 10197, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8075F0C
gUnknown_83E3F7C:: @ 83E3F7C
- .incbin "baserom.gba", 0x3E3F7C, 0x14
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 32, 5
+ obj_image_anim_frame 48, 5
+ obj_image_anim_end
gUnknown_83E3F90:: @ 83E3F90
- .incbin "baserom.gba", 0x3E3F90, 0x4
+ .4byte gUnknown_83E3F7C
gUnknown_83E3F94:: @ 83E3F94
spr_template 10198, 10198, gOamData_83AC9D8, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E3FAC:: @ 83E3FAC
- .incbin "baserom.gba", 0x3E3FAC, 0x70
+ obj_rot_scal_anim_frame 0, 0, 248, 2
+ obj_rot_scal_anim_frame 0, 0, 8, 4
+ obj_rot_scal_anim_frame 0, 0, 248, 2
+ obj_rot_scal_anim_jump 0
+
+gUnknown_83E3FCC:: @ 83E3FCC
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E3FDC:: @ 83E3FDC
+ obj_rot_scal_anim_frame -8, 4, 0, 8
+ obj_rot_scal_anim_loop 0
+ obj_rot_scal_anim_frame 16, -8, 0, 8
+ obj_rot_scal_anim_frame -16, 8, 0, 8
+ obj_rot_scal_anim_loop 1
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 0, 15
+ obj_rot_scal_anim_end
gUnknown_83E401C:: @ 83E401C
- .incbin "baserom.gba", 0x3E401C, 0xC
+ .4byte gUnknown_83E3FAC
+ .4byte gUnknown_83E3FCC
+ .4byte gUnknown_83E3FDC
gUnknown_83E4028:: @ 83E4028
spr_template 10202, 10202, gOamData_83ACBB8, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38
gUnknown_83E4040:: @ 83E4040
- .incbin "baserom.gba", 0x3E4040, 0x48
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 16, 16, 0, 30
+ obj_rot_scal_anim_end 1
+
+gUnknown_83E4058:: @ 83E4058
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 32, 32, 0, 15
+ obj_rot_scal_anim_end 1
+
+gUnknown_83E4070:: @ 83E4070
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 11, 11, 0, 45
+ obj_rot_scal_anim_end 1
gUnknown_83E4088:: @ 83E4088
- .incbin "baserom.gba", 0x3E4088, 0x8
+ .4byte gUnknown_83E4040
+ .4byte gUnknown_83E4058
gUnknown_83E4090:: @ 83E4090
- .incbin "baserom.gba", 0x3E4090, 0x4
+ .4byte gUnknown_83E4070
gUnknown_83E4094:: @ 83E4094
spr_template 10203, 10203, gOamData_83ACAA0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos
gUnknown_83E40AC:: @ 83E40AC
- .incbin "baserom.gba", 0x3E40AC, 0x18
+ obj_rot_scal_anim_frame 512, 512, 0, 0
+ obj_rot_scal_anim_frame -16, -16, 0, 30
+ obj_rot_scal_anim_end 1
gUnknown_83E40C4:: @ 83E40C4
- .incbin "baserom.gba", 0x3E40C4, 0x4
+ .4byte gUnknown_83E40AC
gUnknown_83E40C8:: @ 83E40C8
spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos
@@ -747,19 +1236,43 @@ gUnknown_83E4110:: @ 83E4110
spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8
gUnknown_83E4128:: @ 83E4128
- .incbin "baserom.gba", 0x3E4128, 0x28
+ .incbin "baserom.gba", 0x3E4128, 0x10
+
+gUnknown_83E4138:: @ 83E4138
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 4, 3
+ obj_image_anim_frame 8, 3
+ obj_image_anim_frame 4, 3
+ obj_image_anim_frame 0, 3
+ obj_image_anim_end
gUnknown_83E4150:: @ 83E4150
- .incbin "baserom.gba", 0x3E4150, 0x4
+ .4byte gUnknown_83E4138
gUnknown_83E4154:: @ 83E4154
spr_template 10207, 10207, gOamData_83AC9D0, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648
gUnknown_83E416C:: @ 83E416C
- .incbin "baserom.gba", 0x3E416C, 0x40
+ .incbin "baserom.gba", 0x3E416C, 0x8
+
+gUnknown_83E4174:: @ 83E4174
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 32, 15
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 15, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 32, 15
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 0, 6
+ obj_image_anim_end
gUnknown_83E41AC:: @ 83E41AC
- .incbin "baserom.gba", 0x3E41AC, 0x4
+ .4byte gUnknown_83E4174
gUnknown_83E41B0:: @ 83E41B0
spr_template 10205, 10205, gOamData_83AC9D8, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
@@ -786,10 +1299,12 @@ gUnknown_83E4248:: @ 83E4248
spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C
gUnknown_83E4260:: @ 83E4260
- .incbin "baserom.gba", 0x3E4260, 0x18
+ obj_rot_scal_anim_frame 128, 128, 0, 0
+ obj_rot_scal_anim_frame 8, 8, 0, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E4278:: @ 83E4278
- .incbin "baserom.gba", 0x3E4278, 0x4
+ .4byte gUnknown_83E4260
gUnknown_83E427C:: @ 83E427C
spr_template 10217, 10217, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174
@@ -798,28 +1313,36 @@ gUnknown_83E4294:: @ 83E4294
spr_template 10217, 10217, gOamData_83ACA90, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0
gUnknown_83E42AC:: @ 83E42AC
- .incbin "baserom.gba", 0x3E42AC, 0x18
+ obj_rot_scal_anim_frame 128, 128, 0, 0
+ obj_rot_scal_anim_frame 8, 8, 0, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E42C4:: @ 83E42C4
- .incbin "baserom.gba", 0x3E42C4, 0x4
+ .4byte gUnknown_83E42AC
gUnknown_83E42C8:: @ 83E42C8
spr_template 10237, 10237, gOamData_83ACA88, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C
gUnknown_83E42E0:: @ 83E42E0
- .incbin "baserom.gba", 0x3E42E0, 0x18
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 4, 4
+ obj_image_anim_frame 8, 4
+ obj_image_anim_frame 4, 4
+ obj_image_anim_frame 0, 4
+ obj_image_anim_end
gUnknown_83E42F8:: @ 83E42F8
- .incbin "baserom.gba", 0x3E42F8, 0x4
+ .4byte gUnknown_83E42E0
gUnknown_83E42FC:: @ 83E42FC
spr_template 10218, 10218, gOamData_83AC9D0, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0
gUnknown_83E4314:: @ 83E4314
- .incbin "baserom.gba", 0x3E4314, 0x8
+ obj_image_anim_frame 0, 24
+ obj_image_anim_end
gUnknown_83E431C:: @ 83E431C
- .incbin "baserom.gba", 0x3E431C, 0x4
+ .4byte gUnknown_83E4314
gUnknown_83E4320:: @ 83E4320
spr_template 10220, 10220, gOamData_83AC9D8, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408
@@ -828,28 +1351,58 @@ gUnknown_83E4338:: @ 83E4338
spr_template 10219, 10219, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508
gUnknown_83E4350:: @ 83E4350
- .incbin "baserom.gba", 0x3E4350, 0x10
+ obj_image_anim_frame 0, 3
+ obj_image_anim_jump 0
+
+gUnknown_83E4358:: @ 83E4358
+ obj_image_anim_frame 16, 3
+ obj_image_anim_jump 0
gUnknown_83E4360:: @ 83E4360
- .incbin "baserom.gba", 0x3E4360, 0x8
+ .4byte gUnknown_83E4350
+ .4byte gUnknown_83E4358
gUnknown_83E4368:: @ 83E4368
spr_template 10221, 10221, gOamData_83AC9D8, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C
gUnknown_83E4380:: @ 83E4380
- .incbin "baserom.gba", 0x3E4380, 0x28
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 48, 4
+ obj_image_anim_end
+
+gUnknown_83E4394:: @ 83E4394
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E43A8:: @ 83E43A8
- .incbin "baserom.gba", 0x3E43A8, 0x8
+ .4byte gUnknown_83E4380
+ .4byte gUnknown_83E4394
gUnknown_83E43B0:: @ 83E43B0
spr_template 10222, 10222, gOamData_83AC9D8, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8
gUnknown_83E43C8:: @ 83E43C8
- .incbin "baserom.gba", 0x3E43C8, 0x28
+ obj_image_anim_frame 0, 8
+ obj_image_anim_frame 16, 8
+ obj_image_anim_frame 32, 8
+ obj_image_anim_frame 16, 8
+ obj_image_anim_end
+
+gUnknown_83E43DC:: @ 83E43DC
+ obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 8, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E43F0:: @ 83E43F0
- .incbin "baserom.gba", 0x3E43F0, 0x8
+ .4byte gUnknown_83E43C8
+ .4byte gUnknown_83E43DC
gUnknown_83E43F8:: @ 83E43F8
spr_template 10215, 10215, gOamData_83AC9D8, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708
@@ -861,10 +1414,21 @@ gUnknown_83E4430:: @ 83E4430
spr_template 10225, 10225, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838
gUnknown_83E4448:: @ 83E4448
- .incbin "baserom.gba", 0x3E4448, 0x30
+ obj_rot_scal_anim_frame 0, 0, 0, 5
+ obj_rot_scal_anim_end
+
+gUnknown_83E4458:: @ 83E4458
+ obj_rot_scal_anim_frame 0, 0, 248, 16
+ obj_rot_scal_anim_end 1
+
+gUnknown_83E4468:: @ 83E4468
+ obj_rot_scal_anim_frame 0, 0, 8, 16
+ obj_rot_scal_anim_end 1
gUnknown_83E4478:: @ 83E4478
- .incbin "baserom.gba", 0x3E4478, 0xC
+ .4byte gUnknown_83E4448
+ .4byte gUnknown_83E4458
+ .4byte gUnknown_83E4468
gUnknown_83E4484:: @ 83E4484
spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998
@@ -873,52 +1437,91 @@ gUnknown_83E449C:: @ 83E449C
spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938
gUnknown_83E44B4:: @ 83E44B4
- .incbin "baserom.gba", 0x3E44B4, 0x20
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E44C4:: @ 83E44C4
+ obj_rot_scal_anim_frame 512, 256, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E44D4:: @ 83E44D4
- .incbin "baserom.gba", 0x3E44D4, 0x8
+ .4byte gUnknown_83E44B4
+ .4byte gUnknown_83E44C4
gUnknown_83E44DC:: @ 83E44DC
spr_template 10244, 10244, gOamData_83ACBE0, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4
gUnknown_83E44F4:: @ 83E44F4
- .incbin "baserom.gba", 0x3E44F4, 0x13A0
+ .incbin "baserom.gba", 0x3E44F4, 0x1380
+
+gUnknown_83E5874:: @ 83E5874
+ obj_image_anim_frame 0, 2
+ obj_image_anim_frame 8, 2
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 24, 6
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 40, 2
+ obj_image_anim_frame 48, 2
+ obj_image_anim_end
gUnknown_83E5894:: @ 83E5894
- .incbin "baserom.gba", 0x3E5894, 0x4
+ .4byte gUnknown_83E5874
gUnknown_83E5898:: @ 83E5898
spr_template 10115, 10115, gOamData_83ACA18, gUnknown_83E5894, NULL, gDummySpriteAffineAnimTable, sub_80AAC54
gUnknown_83E58B0:: @ 83E58B0
- .incbin "baserom.gba", 0x3E58B0, 0x18
+ obj_rot_scal_anim_frame -5, -5, 0, 10
+ obj_rot_scal_anim_frame 5, 5, 0, 10
+ obj_rot_scal_anim_jump 0
gUnknown_83E58C8:: @ 83E58C8
- .incbin "baserom.gba", 0x3E58C8, 0x14
+ .4byte gUnknown_83E58B0
+
+gUnknown_83E58CC:: @ 83E58CC
+ obj_image_anim_frame 0, 1
+ obj_image_anim_frame 4, 5
+ obj_image_anim_frame 8, 5
+ obj_image_anim_end
gUnknown_83E58DC:: @ 83E58DC
- .incbin "baserom.gba", 0x3E58DC, 0x4
+ .4byte gUnknown_83E58CC
gUnknown_83E58E0:: @ 83E58E0
spr_template 10146, 10146, gOamData_83ACB50, gUnknown_83E58DC, NULL, gUnknown_83E58C8, sub_80AAC98
gUnknown_83E58F8:: @ 83E58F8
- .incbin "baserom.gba", 0x3E58F8, 0x10
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E5900:: @ 83E5900
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
gUnknown_83E5908:: @ 83E5908
- .incbin "baserom.gba", 0x3E5908, 0x20
+ .4byte gUnknown_83E58F8
+ .4byte gUnknown_83E5900
+
+gUnknown_83E5910:: @ 83E5910
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_frame 96, 96, 0, 1
+ obj_rot_scal_anim_end
gUnknown_83E5928:: @ 83E5928
- .incbin "baserom.gba", 0x3E5928, 0x4
+ .4byte gUnknown_83E5910
gUnknown_83E592C:: @ 83E592C
spr_template 10140, 10140, gOamData_83ACAC8, gUnknown_83E5908, NULL, gUnknown_83E5928, sub_80AAE84
gUnknown_83E5944:: @ 83E5944
- .incbin "baserom.gba", 0x3E5944, 0x14
+ obj_image_anim_frame 0, 1
+ obj_image_anim_frame 4, 1
+ obj_image_anim_frame 8, 1
+ obj_image_anim_frame 12, 1
+ obj_image_anim_jump 0
gUnknown_83E5958:: @ 83E5958
- .incbin "baserom.gba", 0x3E5958, 0x4
+ .4byte gUnknown_83E5944
gUnknown_83E595C:: @ 83E595C
spr_template 10149, 10149, gOamData_83ACAF0, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024
@@ -933,10 +1536,13 @@ gUnknown_83E59A4:: @ 83E59A4
spr_template 10265, 10265, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E59BC:: @ 83E59BC
- .incbin "baserom.gba", 0x3E59BC, 0x10
+ obj_image_anim_frame 16, 2
+ obj_image_anim_frame 32, 2
+ obj_image_anim_frame 48, 2
+ obj_image_anim_jump 0
gUnknown_83E59CC:: @ 83E59CC
- .incbin "baserom.gba", 0x3E59CC, 0x4
+ .4byte gUnknown_83E59BC
gUnknown_83E59D0:: @ 83E59D0
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024
@@ -945,13 +1551,20 @@ gUnknown_83E59E8:: @ 83E59E8
spr_template 10165, 10165, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024
gUnknown_83E5A00:: @ 83E5A00
- .incbin "baserom.gba", 0x3E5A00, 0x30
+ obj_rot_scal_anim_frame 3, 3, 10, 50
+ obj_rot_scal_anim_frame 0, 0, 0, 10
+ obj_rot_scal_anim_frame -20, -20, 246, 20
+ obj_rot_scal_anim_end
+
+gUnknown_83E5A20:: @ 83E5A20
+ obj_rot_scal_anim_frame 336, 336, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E5A30:: @ 83E5A30
- .incbin "baserom.gba", 0x3E5A30, 0x4
+ .4byte gUnknown_83E5A00
gUnknown_83E5A34:: @ 83E5A34
- .incbin "baserom.gba", 0x3E5A34, 0x4
+ .4byte gUnknown_83E5A20
gUnknown_83E5A38:: @ 83E5A38
spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A30, sub_80AB168
@@ -960,13 +1573,18 @@ gUnknown_83E5A50:: @ 83E5A50
spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A34, sub_80AB1F8
gUnknown_83E5A68:: @ 83E5A68
- .incbin "baserom.gba", 0x3E5A68, 0x10
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E5A70:: @ 83E5A70
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
gUnknown_83E5A78:: @ 83E5A78
- .incbin "baserom.gba", 0x3E5A78, 0x4
+ .4byte gUnknown_83E5A68
gUnknown_83E5A7C:: @ 83E5A7C
- .incbin "baserom.gba", 0x3E5A7C, 0x4
+ .4byte gUnknown_83E5A70
gUnknown_83E5A80:: @ 83E5A80
spr_template 10155, 10155, gOamData_83ACAF0, gUnknown_83E5A78, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile
@@ -984,19 +1602,45 @@ gUnknown_83E5AE0:: @ 83E5AE0
spr_template 10268, 10268, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABF60
gUnknown_83E5AF8:: @ 83E5AF8
- .incbin "baserom.gba", 0x3E5AF8, 0x18
+ obj_image_anim_frame 8, 1
+ obj_image_anim_end
+
+gUnknown_83E5B00:: @ 83E5B00
+ obj_image_anim_frame 9, 1
+ obj_image_anim_end
+
+gUnknown_83E5B08:: @ 83E5B08
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
gUnknown_83E5B10:: @ 83E5B10
- .incbin "baserom.gba", 0x3E5B10, 0x8
+ .4byte gUnknown_83E5AF8
+ .4byte gUnknown_83E5B00
gUnknown_83E5B18:: @ 83E5B18
- .incbin "baserom.gba", 0x3E5B18, 0x4C
+ .4byte gUnknown_83E5B08
+
+gUnknown_83E5B1C:: @ 83E5B1C
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame -10, -10, 0, 15
+ obj_rot_scal_anim_end
+
+gUnknown_83E5B34:: @ 83E5B34
+ obj_rot_scal_anim_frame 224, 224, 0, 0
+ obj_rot_scal_anim_frame -8, -8, 0, 15
+ obj_rot_scal_anim_end
+
+gUnknown_83E5B4C:: @ 83E5B4C
+ obj_rot_scal_anim_frame 336, 336, 0, 0
+ obj_rot_scal_anim_frame 0, 0, 0, 15
+ obj_rot_scal_anim_end
gUnknown_83E5B64:: @ 83E5B64
- .incbin "baserom.gba", 0x3E5B64, 0x8
+ .4byte gUnknown_83E5B1C
+ .4byte gUnknown_83E5B34
gUnknown_83E5B6C:: @ 83E5B6C
- .incbin "baserom.gba", 0x3E5B6C, 0x4
+ .4byte gUnknown_83E5B4C
gUnknown_83E5B70:: @ 83E5B70
spr_template 10155, 10155, gOamData_83AC9C8, gUnknown_83E5B10, NULL, gDummySpriteAffineAnimTable, sub_80AC624
@@ -1008,10 +1652,20 @@ gUnknown_83E5BA0:: @ 83E5BA0
spr_template 10155, 10155, gOamData_83ACA30, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350
gUnknown_83E5BB8:: @ 83E5BB8
- .incbin "baserom.gba", 0x3E5BB8, 0x20
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 48, 4
+ obj_image_anim_jump 0
+
+gUnknown_83E5BC8:: @ 83E5BC8
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_jump 0
gUnknown_83E5BD8:: @ 83E5BD8
- .incbin "baserom.gba", 0x3E5BD8, 0x8
+ .4byte gUnknown_83E5BB8
+ .4byte gUnknown_83E5BC8
gUnknown_83E5BE0:: @ 83E5BE0
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5BD8, NULL, gDummySpriteAffineAnimTable, sub_80AC90C
@@ -1020,16 +1674,37 @@ gUnknown_83E5BF8:: @ 83E5BF8
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5BD8, NULL, gDummySpriteAffineAnimTable, sub_80AC94C
gUnknown_83E5C10:: @ 83E5C10
- .incbin "baserom.gba", 0x3E5C10, 0x24
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 16, 3
+ obj_image_anim_frame 32, 3
+ obj_image_anim_frame 48, 3
+ obj_image_anim_frame 64, 3
+ obj_image_anim_frame 80, 3
+ obj_image_anim_frame 96, 3
+ obj_image_anim_frame 112, 3
+ obj_image_anim_jump 0
gUnknown_83E5C34:: @ 83E5C34
- .incbin "baserom.gba", 0x3E5C34, 0x1C
+ .4byte gUnknown_83E5C10
+
+gUnknown_83E5C38:: @ 83E5C38
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 32, 5
+ obj_image_anim_frame 48, 5
+ obj_image_anim_frame 64, 5
+ obj_image_anim_jump 0
gUnknown_83E5C50:: @ 83E5C50
- .incbin "baserom.gba", 0x3E5C50, 0x1C
+ .4byte gUnknown_83E5C38
+
+gUnknown_83E5C54:: @ 83E5C54
+ obj_rot_scal_anim_frame 50, 256, 0, 0
+ obj_rot_scal_anim_frame 32, 0, 0, 7
+ obj_rot_scal_anim_end
gUnknown_83E5C6C:: @ 83E5C6C
- .incbin "baserom.gba", 0x3E5C6C, 0x4
+ .4byte gUnknown_83E5C54
gUnknown_83E5C70:: @ 83E5C70
spr_template 10033, 10033, gOamData_83ACA38, gUnknown_83E5C34, NULL, gUnknown_83E5C6C, sub_80ACA00
@@ -1042,19 +1717,29 @@ gUnknown_83E5CA0:: @ 83E5CA0
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5C50, NULL, gDummySpriteAffineAnimTable, sub_80AC990
gUnknown_83E5CD0:: @ 83E5CD0
- .incbin "baserom.gba", 0x3E5CD0, 0x44
+ .incbin "baserom.gba", 0x3E5CD0, 0x2C
+
+gUnknown_83E5CFC:: @ 83E5CFC
+ obj_rot_scal_anim_frame 80, 80, 0, 0
+ obj_rot_scal_anim_frame 2, 2, 10, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E5D14:: @ 83E5D14
- .incbin "baserom.gba", 0x3E5D14, 0x4
+ .4byte gUnknown_83E5CFC
gUnknown_83E5D18:: @ 83E5D18
spr_template 10157, 10157, gOamData_83ACB58, gDummySpriteAnimTable, NULL, gUnknown_83E5D14, sub_80ACBB0
gUnknown_83E5D30:: @ 83E5D30
- .incbin "baserom.gba", 0x3E5D30, 0x18
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 48, 4
+ obj_image_anim_frame 64, 4
+ obj_image_anim_jump 0
gUnknown_83E5D48:: @ 83E5D48
- .incbin "baserom.gba", 0x3E5D48, 0x4
+ .4byte gUnknown_83E5D30
gUnknown_83E5D4C:: @ 83E5D4C
spr_template 10029, 10029, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
@@ -1069,10 +1754,15 @@ gUnknown_83E5D94:: @ 83E5D94
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_80ACC60
gUnknown_83E5DAC:: @ 83E5DAC
- .incbin "baserom.gba", 0x3E5DAC, 0xC
+ obj_image_anim_frame 32, 6
+ obj_image_anim_frame 48, 6
+ obj_image_anim_jump 0
gUnknown_83E5DB8:: @ 83E5DB8
- .incbin "baserom.gba", 0x3E5DB8, 0x2C
+ .4byte gUnknown_83E5DAC
+
+gUnknown_83E5DBC:: @ 83E5DBC
+ .incbin "baserom.gba", 0x3E5DBC, 0x28
gUnknown_83E5DE4:: @ 83E5DE4
spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5DB8, NULL, gDummySpriteAffineAnimTable, sub_80ACDA8
@@ -1087,28 +1777,48 @@ gUnknown_83E5E2C:: @ 83E5E2C
spr_template 10201, 10201, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AD330
gUnknown_83E5E44:: @ 83E5E44
- .incbin "baserom.gba", 0x3E5E44, 0x2
-
-gUnknown_83E5E46:: @ 83E5E46
- .incbin "baserom.gba", 0x3E5E46, 0x1A
+ .incbin "baserom.gba", 0x3E5E44, 0x1C
gUnknown_83E5E60:: @ 83E5E60
spr_template 10201, 10201, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AD454
gUnknown_83E5E78:: @ 83E5E78
- .incbin "baserom.gba", 0x3E5E78, 0x2C
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 4, 5
+ obj_image_anim_frame 8, 5
+ obj_image_anim_frame 12, 5
+ obj_image_anim_jump 0
+
+gUnknown_83E5E8C:: @ 83E5E8C
+ obj_image_anim_frame 16, 5
+ obj_image_anim_end
+
+gUnknown_83E5E94:: @ 83E5E94
+ obj_image_anim_frame 20, 5
+ obj_image_anim_end
+
+gUnknown_83E5E9C:: @ 83E5E9C
+ obj_image_anim_frame 20, 5
+ obj_image_anim_end
gUnknown_83E5EA4:: @ 83E5EA4
- .incbin "baserom.gba", 0x3E5EA4, 0x10
+ .4byte gUnknown_83E5E78
+ .4byte gUnknown_83E5E8C
+ .4byte gUnknown_83E5E94
+ .4byte gUnknown_83E5E9C
gUnknown_83E5EB4:: @ 83E5EB4
spr_template 10231, 10231, gOamData_83AC9D0, gUnknown_83E5EA4, NULL, gDummySpriteAffineAnimTable, sub_80AD540
gUnknown_83E5ECC:: @ 83E5ECC
- .incbin "baserom.gba", 0x3E5ECC, 0x14
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 32, 5
+ obj_image_anim_frame 48, 5
+ obj_image_anim_jump 0
gUnknown_83E5EE0:: @ 83E5EE0
- .incbin "baserom.gba", 0x3E5EE0, 0x4
+ .4byte gUnknown_83E5ECC
gUnknown_83E5EE4:: @ 83E5EE4
spr_template 10232, 10232, gOamData_83AC9D8, gUnknown_83E5EE0, NULL, gDummySpriteAffineAnimTable, sub_80AD6F4
@@ -1117,10 +1827,18 @@ gUnknown_83E5EFC:: @ 83E5EFC
.incbin "baserom.gba", 0x3E5EFC, 0x10
gUnknown_83E5F0C:: @ 83E5F0C
- .incbin "baserom.gba", 0x3E5F0C, 0x28
+ .incbin "baserom.gba", 0x3E5F0C, 0x10
+
+gUnknown_83E5F1C:: @ 83E5F1C
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 32, 8
+ obj_image_anim_frame 48, 5
+ obj_image_anim_frame 64, 5
+ obj_image_anim_end
gUnknown_83E5F34:: @ 83E5F34
- .incbin "baserom.gba", 0x3E5F34, 0x4
+ .4byte gUnknown_83E5F1C
gUnknown_83E5F38:: @ 83E5F38
spr_template 10037, 10037, gOamData_83AC9D8, gUnknown_83E5F34, NULL, gDummySpriteAffineAnimTable, sub_80ADBEC
@@ -1135,22 +1853,32 @@ gUnknown_83E5FDC:: @ 83E5FDC
spr_template 10171, 10171, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E5FF4:: @ 83E5FF4
- .incbin "baserom.gba", 0x3E5FF4, 0x10
+ obj_rot_scal_anim_frame 0, 0, 20, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E6004:: @ 83E6004
- .incbin "baserom.gba", 0x3E6004, 0x4
+ .4byte gUnknown_83E5FF4
gUnknown_83E6008:: @ 83E6008
spr_template 10011, 10011, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E6004, sub_80ADEB0
gUnknown_83E6020:: @ 83E6020
- .incbin "baserom.gba", 0x3E6020, 0x10
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 16, 6
+ obj_image_anim_frame 32, 6
+ obj_image_anim_jump 0
gUnknown_83E6030:: @ 83E6030
- .incbin "baserom.gba", 0x3E6030, 0x24
+ .4byte gUnknown_83E6020
+
+gUnknown_83E6034:: @ 83E6034
+ obj_rot_scal_anim_frame 232, 232, 0, 0
+ obj_rot_scal_anim_frame -8, -8, 0, 10
+ obj_rot_scal_anim_frame 8, 8, 0, 10
+ obj_rot_scal_anim_jump 1
gUnknown_83E6054:: @ 83E6054
- .incbin "baserom.gba", 0x3E6054, 0x4
+ .4byte gUnknown_83E6034
gUnknown_83E6058:: @ 83E6058
spr_template 10282, 10282, gOamData_83ACA38, gUnknown_83E6030, NULL, gUnknown_83E6054, sub_80AE000
@@ -1168,28 +1896,70 @@ gUnknown_83E60B8:: @ 83E60B8
spr_template 10173, 10173, gOamData_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AE470
gUnknown_83E60D0:: @ 83E60D0
- .incbin "baserom.gba", 0x3E60D0, 0x48
+ .incbin "baserom.gba", 0x3E60D0, 0x20
+
+gUnknown_83E60F0:: @ 83E60F0
+ obj_image_anim_frame 3, 1
+ obj_image_anim_frame 2, 1
+ obj_image_anim_frame 1, 1
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E6104:: @ 83E6104
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 1, 5
+ obj_image_anim_frame 2, 5
+ obj_image_anim_frame 3, 5
+ obj_image_anim_end
gUnknown_83E6118:: @ 83E6118
- .incbin "baserom.gba", 0x3E6118, 0x8
+ .4byte gUnknown_83E60F0
+ .4byte gUnknown_83E6104
gUnknown_83E6120:: @ 83E6120
spr_template 10211, 10211, gOamData_83AC9C8, gUnknown_83E6118, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E6138:: @ 83E6138
- .incbin "baserom.gba", 0x3E6138, 0x90
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 4, 4, 0, 60
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_loop 0
+ obj_rot_scal_anim_frame -4, -4, 0, 5
+ obj_rot_scal_anim_frame 4, 4, 0, 5
+ obj_rot_scal_anim_loop 10
+ obj_rot_scal_anim_end
+
+gUnknown_83E6178:: @ 83E6178
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 8, 8, 0, 30
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame -4, -4, 0, 5
+ obj_rot_scal_anim_frame 4, 4, 0, 5
+ obj_rot_scal_anim_jump 3
+
+gUnknown_83E61A8:: @ 83E61A8
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 8, 8, 0, 30
+ obj_rot_scal_anim_frame -8, -8, 0, 30
+ obj_rot_scal_anim_end
gUnknown_83E61C8:: @ 83E61C8
- .incbin "baserom.gba", 0x3E61C8, 0xC
+ .4byte gUnknown_83E6138
+ .4byte gUnknown_83E6178
+ .4byte gUnknown_83E61A8
gUnknown_83E61D4:: @ 83E61D4
spr_template 10212, 10212, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E61C8, sub_80AE71C
gUnknown_83E61EC:: @ 83E61EC
- .incbin "baserom.gba", 0x3E61EC, 0x14
+ obj_image_anim_frame 0, 3
+ obj_image_anim_frame 16, 3
+ obj_image_anim_frame 32, 3
+ obj_image_anim_frame 48, 3
+ obj_image_anim_end
gUnknown_83E6200:: @ 83E6200
- .incbin "baserom.gba", 0x3E6200, 0x4
+ .4byte gUnknown_83E61EC
gUnknown_83E6204:: @ 83E6204
spr_template 10213, 10213, gOamData_83AC9D8, gUnknown_83E6200, NULL, gDummySpriteAffineAnimTable, sub_80AE774
@@ -1198,13 +1968,33 @@ gUnknown_83E621C:: @ 83E621C
spr_template 10212, 10212, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E61C8, sub_80AE7DC
gUnknown_83E6234:: @ 83E6234
- .incbin "baserom.gba", 0x3E6234, 0x20
+ obj_image_anim_frame 0, 3
+ obj_image_anim_end
+
+gUnknown_83E623C:: @ 83E623C
+ obj_image_anim_frame 2, 3
+ obj_image_anim_end
+
+gUnknown_83E6244:: @ 83E6244
+ obj_image_anim_frame 4, 3
+ obj_image_anim_end
+
+gUnknown_83E624C:: @ 83E624C
+ obj_image_anim_frame 6, 3
+ obj_image_anim_end
gUnknown_83E6254:: @ 83E6254
- .incbin "baserom.gba", 0x3E6254, 0x20
+ .4byte gUnknown_83E6234
+ .4byte gUnknown_83E623C
+ .4byte gUnknown_83E6244
+ .4byte gUnknown_83E624C
+
+gUnknown_83E6264:: @ 83E6264
+ obj_rot_scal_anim_frame 256, 256, 64, 0
+ obj_rot_scal_anim_end
gUnknown_83E6274:: @ 83E6274
- .incbin "baserom.gba", 0x3E6274, 0x4
+ .4byte gUnknown_83E6264
gUnknown_83E6278:: @ 83E6278
spr_template 10001, 10001, gOamData_83ACAC8, gUnknown_83E6254, NULL, gUnknown_83E6274, sub_80AEC34
@@ -1216,25 +2006,53 @@ gUnknown_83E62A8:: @ 83E62A8
spr_template 10001, 10001, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AEF60
gUnknown_83E62C0:: @ 83E62C0
- .incbin "baserom.gba", 0x3E62C0, 0x60
+ .incbin "baserom.gba", 0x3E62C0, 0x30
+
+gUnknown_83E62F0:: @ 83E62F0
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
+
+gUnknown_83E62F8:: @ 83E62F8
+ obj_image_anim_frame 6, 1
+ obj_image_anim_end
+
+gUnknown_83E6300:: @ 83E6300
+ obj_image_anim_frame 7, 1
+ obj_image_anim_end
+
+gUnknown_83E6308:: @ 83E6308
+ obj_image_anim_frame 8, 1
+ obj_image_anim_end
+
+gUnknown_83E6310:: @ 83E6310
+ obj_image_anim_frame 12, 6
+ obj_image_anim_frame 13, 6
+ obj_image_anim_jump 0
+
+gUnknown_83E631C:: @ 83E631C
+ .incbin "baserom.gba", 0x3E631C, 0x4
gUnknown_83E6320:: @ 83E6320
- .incbin "baserom.gba", 0x3E6320, 0x4
+ .4byte gUnknown_83E62F0
gUnknown_83E6324:: @ 83E6324
- .incbin "baserom.gba", 0x3E6324, 0x4
+ .4byte gUnknown_83E62F8
gUnknown_83E6328:: @ 83E6328
- .incbin "baserom.gba", 0x3E6328, 0x4
+ .4byte gUnknown_83E6300
gUnknown_83E632C:: @ 83E632C
- .incbin "baserom.gba", 0x3E632C, 0x4
+ .4byte gUnknown_83E6308
gUnknown_83E6330:: @ 83E6330
- .incbin "baserom.gba", 0x3E6330, 0x14
+ .4byte gUnknown_83E6310
+
+gUnknown_83E6334:: @ 83E6334
+ obj_rot_scal_anim_frame 0, 0, 40, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E6344:: @ 83E6344
- .incbin "baserom.gba", 0x3E6344, 0x4
+ .4byte gUnknown_83E6334
gUnknown_83E6348:: @ 83E6348
spr_template 10141, 10141, gOamData_83ACBE8, gUnknown_83E6320, NULL, gUnknown_83E6344, sub_80AF2F0
@@ -1243,10 +2061,11 @@ gUnknown_83E6360:: @ 83E6360
spr_template 10141, 10141, gOamData_83ACAE8, gUnknown_83E6324, NULL, gDummySpriteAffineAnimTable, sub_80AF2F0
gUnknown_83E6378:: @ 83E6378
- .incbin "baserom.gba", 0x3E6378, 0x10
+ obj_rot_scal_anim_frame 0, 0, 10, 1
+ obj_rot_scal_anim_jump 0
gUnknown_83E6388:: @ 83E6388
- .incbin "baserom.gba", 0x3E6388, 0x4
+ .4byte gUnknown_83E6378
gUnknown_83E638C:: @ 83E638C
spr_template 10141, 10141, gOamData_83ACB88, gUnknown_83E6320, NULL, gUnknown_83E6388, sub_80AF330
@@ -1255,10 +2074,13 @@ gUnknown_83E63A4:: @ 83E63A4
spr_template 10141, 10141, gOamData_83ACAE8, gUnknown_83E6324, NULL, gDummySpriteAffineAnimTable, sub_80AF330
gUnknown_83E63BC:: @ 83E63BC
- .incbin "baserom.gba", 0x3E63BC, 0x20
+ obj_rot_scal_anim_frame 206, 206, 0, 0
+ obj_rot_scal_anim_frame 5, 5, 0, 10
+ obj_rot_scal_anim_frame 0, 0, 0, 6
+ obj_rot_scal_anim_end
gUnknown_83E63DC:: @ 83E63DC
- .incbin "baserom.gba", 0x3E63DC, 0x4
+ .4byte gUnknown_83E63BC
gUnknown_83E63E0:: @ 83E63E0
spr_template 10141, 10141, gOamData_83ACB88, gUnknown_83E6320, NULL, gUnknown_83E63DC, sub_80AF3B8
@@ -1276,19 +2098,28 @@ gUnknown_83E6440:: @ 83E6440
spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6328, NULL, gDummySpriteAffineAnimTable, sub_80AF6D8
gUnknown_83E6458:: @ 83E6458
- .incbin "baserom.gba", 0x3E6458, 0x20
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 2, 5
+ obj_image_anim_frame 4, 5
+ obj_image_anim_frame 6, 5
+ obj_image_anim_frame 4, 5
+ obj_image_anim_frame 2, 5
+ obj_image_anim_frame 0, 5
+ obj_image_anim_end
gUnknown_83E6478:: @ 83E6478
- .incbin "baserom.gba", 0x3E6478, 0x4
+ .4byte gUnknown_83E6458
gUnknown_83E647C:: @ 83E647C
spr_template 10142, 10142, gOamData_83ACB28, gUnknown_83E6478, NULL, gDummySpriteAffineAnimTable, sub_80AF88C
gUnknown_83E6494:: @ 83E6494
- .incbin "baserom.gba", 0x3E6494, 0xC
+ obj_image_anim_frame 0, 8
+ obj_image_anim_frame 8, 8
+ obj_image_anim_jump 0
gUnknown_83E64A0:: @ 83E64A0
- .incbin "baserom.gba", 0x3E64A0, 0x4
+ .4byte gUnknown_83E6494
gUnknown_83E64A4:: @ 83E64A4
spr_template 10144, 10144, gOamData_83ACB18, gUnknown_83E64A0, NULL, gDummySpriteAffineAnimTable, sub_80AF914
@@ -1309,13 +2140,31 @@ gUnknown_83E6514:: @ 83E6514
spr_template 10172, 10172, gOamData_83ACB18, gUnknown_83E64A0, NULL, gDummySpriteAffineAnimTable, sub_80AFFD4
gUnknown_83E652C:: @ 83E652C
- .incbin "baserom.gba", 0x3E652C, 0x68
+ .incbin "baserom.gba", 0x3E652C, 0x28
+
+gUnknown_83E6554:: @ 83E6554
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6564:: @ 83E6564
+ obj_rot_scal_anim_frame 240, 240, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6574:: @ 83E6574
+ obj_rot_scal_anim_frame 224, 224, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6584:: @ 83E6584
+ obj_rot_scal_anim_frame 336, 336, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E6594:: @ 83E6594
- .incbin "baserom.gba", 0x3E6594, 0xC
+ .4byte gUnknown_83E6554
+ .4byte gUnknown_83E6564
+ .4byte gUnknown_83E6574
gUnknown_83E65A0:: @ 83E65A0
- .incbin "baserom.gba", 0x3E65A0, 0x4
+ .4byte gUnknown_83E6584
gUnknown_83E65A4:: @ 83E65A4
spr_template 10263, 10263, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E6594, sub_80B05CC
@@ -1324,13 +2173,46 @@ gUnknown_83E65BC:: @ 83E65BC
spr_template 10263, 10263, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E65A0, sub_8077350
gUnknown_83E65D4:: @ 83E65D4
- .incbin "baserom.gba", 0x3E65D4, 0x1C
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E65DC:: @ 83E65DC
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_frame 48, 4
+ obj_image_anim_frame 64, 4
+ obj_image_anim_end
gUnknown_83E65F0:: @ 83E65F0
- .incbin "baserom.gba", 0x3E65F0, 0x58
+ .4byte gUnknown_83E65D4
+ .4byte gUnknown_83E65DC
+
+gUnknown_83E65F8:: @ 83E65F8
+ obj_rot_scal_anim_frame 224, 224, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6608:: @ 83E6608
+ obj_rot_scal_anim_frame 280, 280, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6618:: @ 83E6618
+ obj_rot_scal_anim_frame 336, 336, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6628:: @ 83E6628
+ obj_rot_scal_anim_frame 384, 384, 0, 0
+ obj_rot_scal_anim_end
+
+gUnknown_83E6638:: @ 83E6638
+ obj_rot_scal_anim_frame 448, 448, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E6648:: @ 83E6648
- .incbin "baserom.gba", 0x3E6648, 0x14
+ .4byte gUnknown_83E65F8
+ .4byte gUnknown_83E6608
+ .4byte gUnknown_83E6618
+ .4byte gUnknown_83E6628
+ .4byte gUnknown_83E6638
gUnknown_83E665C:: @ 83E665C
spr_template 10043, 10043, gOamData_83ACA98, gUnknown_83E65F0, NULL, gUnknown_83E6648, unc_080B06FC
@@ -1340,16 +2222,35 @@ gUnknown_83E6674:: @ 83E6674
spr_template 10050, 10050, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, unc_080B08A0
gUnknown_83E66A4:: @ 83E66A4
- .incbin "baserom.gba", 0x3E66A4, 0x28
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E66AC:: @ 83E66AC
+ obj_image_anim_frame 16, 1
+ obj_image_anim_end
+
+gUnknown_83E66B4:: @ 83E66B4
+ obj_image_anim_frame 32, 1
+ obj_image_anim_end
+
+gUnknown_83E66BC:: @ 83E66BC
+ obj_image_anim_frame 48, 1
+ obj_image_anim_end
+
+gUnknown_83E66C4:: @ 83E66C4
+ obj_image_anim_frame 48, 1, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E66CC:: @ 83E66CC
- .incbin "baserom.gba", 0x3E66CC, 0x4
+ .4byte gUnknown_83E66A4
gUnknown_83E66D0:: @ 83E66D0
- .incbin "baserom.gba", 0x3E66D0, 0x8
+ .4byte gUnknown_83E66AC
+ .4byte gUnknown_83E66B4
gUnknown_83E66D8:: @ 83E66D8
- .incbin "baserom.gba", 0x3E66D8, 0x8
+ .4byte gUnknown_83E66BC
+ .4byte gUnknown_83E66C4
gUnknown_83E66E0:: @ 83E66E0
spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B08DC
@@ -1370,19 +2271,23 @@ gUnknown_83E6758:: @ 83E6758
spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66D0, NULL, gDummySpriteAffineAnimTable, sub_80B0C28
gUnknown_83E6770:: @ 83E6770
- .incbin "baserom.gba", 0x3E6770, 0x18
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame -8, -8, 20, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E6788:: @ 83E6788
- .incbin "baserom.gba", 0x3E6788, 0x4
+ .4byte gUnknown_83E6770
gUnknown_83E678C:: @ 83E678C
spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E6788, sub_80B0CEC
gUnknown_83E67A4:: @ 83E67A4
- .incbin "baserom.gba", 0x3E67A4, 0x18
+ obj_rot_scal_anim_frame 256, 256, 0, 0
+ obj_rot_scal_anim_frame -4, -4, 20, 1
+ obj_rot_scal_anim_jump 1
gUnknown_83E67BC:: @ 83E67BC
- .incbin "baserom.gba", 0x3E67BC, 0x4
+ .4byte gUnknown_83E67A4
gUnknown_83E67C0:: @ 83E67C0
spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E67BC, sub_80B0CEC
@@ -1400,10 +2305,14 @@ gUnknown_83E6820:: @ 83E6820
spr_template 10208, 10208, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B0F68
gUnknown_83E6838:: @ 83E6838
- .incbin "baserom.gba", 0x3E6838, 0x28
+ obj_rot_scal_anim_frame 32, 32, 0, 0
+ obj_rot_scal_anim_frame 4, 4, 0, 64
+ obj_rot_scal_anim_frame -6, -6, 0, 8
+ obj_rot_scal_anim_frame 6, 6, 0, 8
+ obj_rot_scal_anim_jump 2
gUnknown_83E6860:: @ 83E6860
- .incbin "baserom.gba", 0x3E6860, 0x4
+ .4byte gUnknown_83E6838
gUnknown_83E6864:: @ 83E6864
spr_template 10212, 10212, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E6860, sub_80B107C
@@ -1418,58 +2327,114 @@ gUnknown_83E68AC:: @ 83E68AC
spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B13F8
gUnknown_83E68C4:: @ 83E68C4
- .incbin "baserom.gba", 0x3E68C4, 0x30
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 16, 4
+ obj_image_anim_frame 32, 4
+ obj_image_anim_end
+
+gUnknown_83E68D4:: @ 83E68D4
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_end
+
+gUnknown_83E68E4:: @ 83E68E4
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E68F4:: @ 83E68F4
- .incbin "baserom.gba", 0x3E68F4, 0xC
+ .4byte gUnknown_83E68C4
+ .4byte gUnknown_83E68D4
+ .4byte gUnknown_83E68E4
gUnknown_83E6900:: @ 83E6900
spr_template 10245, 10245, gOamData_83AC9D8, gUnknown_83E68F4, NULL, gDummySpriteAffineAnimTable, sub_80B1484
gUnknown_83E6918:: @ 83E6918
- .incbin "baserom.gba", 0x3E6918, 0x24
+ obj_image_anim_frame 0, 6
+ obj_image_anim_frame 64, 6
+ obj_image_anim_end
+
+gUnknown_83E6924:: @ 83E6924
+ obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_end
+
+gUnknown_83E6930:: @ 83E6930
+ obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
gUnknown_83E693C:: @ 83E693C
- .incbin "baserom.gba", 0x3E693C, 0xC
+ .4byte gUnknown_83E6918
+ .4byte gUnknown_83E6924
+ .4byte gUnknown_83E6930
gUnknown_83E6948:: @ 83E6948
spr_template 10246, 10246, gOamData_83AC9E0, gUnknown_83E693C, NULL, gDummySpriteAffineAnimTable, sub_80B1484
gUnknown_83E6960:: @ 83E6960
- .incbin "baserom.gba", 0x3E6960, 0x18
+ obj_rot_scal_anim_frame 512, 512, 0, 0
+ obj_rot_scal_anim_frame -32, -32, 0, 8
+ obj_rot_scal_anim_end
gUnknown_83E6978:: @ 83E6978
- .incbin "baserom.gba", 0x3E6978, 0x4
+ .4byte gUnknown_83E6960
gUnknown_83E697C:: @ 83E697C
spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E6978, sub_80B14F0
gUnknown_83E6994:: @ 83E6994
- .incbin "baserom.gba", 0x3E6994, 0x14
+ obj_image_anim_frame 0, 5
+ obj_image_anim_frame 8, 5
+ obj_image_anim_frame 16, 5
+ obj_image_anim_frame 24, 5
+ obj_image_anim_end
gUnknown_83E69A8:: @ 83E69A8
- .incbin "baserom.gba", 0x3E69A8, 0x4
+ .4byte gUnknown_83E6994
gUnknown_83E69AC:: @ 83E69AC
spr_template 10151, 10151, gOamData_83ACA18, gUnknown_83E69A8, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E69C4:: @ 83E69C4
- .incbin "baserom.gba", 0x3E69C4, 0x18
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+gUnknown_83E69CC:: @ 83E69CC
+ obj_image_anim_frame 4, 1
+ obj_image_anim_end
+
+gUnknown_83E69D4:: @ 83E69D4
+ obj_image_anim_frame 8, 1
+ obj_image_anim_end
gUnknown_83E69DC:: @ 83E69DC
- .incbin "baserom.gba", 0x3E69DC, 0x4
+ .4byte gUnknown_83E69C4
gUnknown_83E69E0:: @ 83E69E0
- .incbin "baserom.gba", 0x3E69E0, 0x4
+ .4byte gUnknown_83E69CC
gUnknown_83E69E4:: @ 83E69E4
- .incbin "baserom.gba", 0x3E69E4, 0x34
+ .4byte gUnknown_83E69D4
+
+gUnknown_83E69E8:: @ 83E69E8
+ obj_rot_scal_anim_frame 352, 352, 0, 0
+ obj_rot_scal_anim_frame -10, -10, 0, 10
+ obj_rot_scal_anim_frame 10, 10, 0, 10
+ obj_rot_scal_anim_jump 0
+
+gUnknown_83E6A08:: @ 83E6A08
+ obj_rot_scal_anim_frame 236, 236, 0, 0
+ obj_rot_scal_anim_end
gUnknown_83E6A18:: @ 83E6A18
- .incbin "baserom.gba", 0x3E6A18, 0x4
+ .4byte gUnknown_83E69E8
gUnknown_83E6A1C:: @ 83E6A1C
- .incbin "baserom.gba", 0x3E6A1C, 0x4
+ .4byte gUnknown_83E6A08
gUnknown_83E6A20:: @ 83E6A20
spr_template 10150, 10150, gOamData_83ACA90, gUnknown_83E69DC, NULL, gUnknown_83E6A18, sub_80B1620
@@ -1481,22 +2446,27 @@ gUnknown_83E6A50:: @ 83E6A50
spr_template 10150, 10150, gOamData_83ACA30, gUnknown_83E69E4, NULL, gUnknown_83E6A1C, sub_80B1744
gUnknown_83E6A68:: @ 83E6A68
- .incbin "baserom.gba", 0x3E6A68, 0x18
+ obj_rot_scal_anim_frame -16, 16, 0, 6
+ obj_rot_scal_anim_frame 16, -16, 0, 6
+ obj_rot_scal_anim_jump 0
gUnknown_83E6A80:: @ 83E6A80
- .incbin "baserom.gba", 0x3E6A80, 0x4
+ .4byte gUnknown_83E6A68
gUnknown_83E6A84:: @ 83E6A84
spr_template 10150, 10150, gOamData_83ACA90, gUnknown_83E69E0, NULL, gUnknown_83E6A80, sub_80B17C4
gUnknown_83E6A9C:: @ 83E6A9C
- .incbin "baserom.gba", 0x3E6A9C, 0x18
+ obj_rot_scal_anim_frame 156, 156, 0, 0
+ obj_rot_scal_anim_frame 5, 5, 0, 20
+ obj_rot_scal_anim_end
gUnknown_83E6AB4:: @ 83E6AB4
- .incbin "baserom.gba", 0x3E6AB4, 0x4
+ .4byte gUnknown_83E6A9C
gUnknown_83E6AB8:: @ 83E6AB8
spr_template 10150, 10150, gOamData_83ACA30, gUnknown_83E69DC, NULL, gUnknown_83E6AB4, sub_80B1838
gUnknown_83E6AD0:: @ 83E6AD0
spr_template 10155, 10155, gOamData_83ACB50, gUnknown_83E5A78, NULL, gUnknown_83E6AB4, sub_80B1838
+