summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_effects_misc.s332
-rw-r--r--data/battle_anim_scripts.s330
-rw-r--r--data/battle_anim_special.s28
-rw-r--r--data/battle_anim_status_effects.s20
-rw-r--r--data/berry_crush.s10
-rw-r--r--data/field_weather.s2
-rw-r--r--data/pokemon_jump.s2
7 files changed, 362 insertions, 362 deletions
diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s
index ff14e90a4..eecd299ff 100644
--- a/data/battle_anim_effects_misc.s
+++ b/data/battle_anim_effects_misc.s
@@ -9,7 +9,7 @@
gUnknown_83E2964:: @ 83E2964
.byte 0x02, 0x04, 0x01, 0x03
-gUnknown_83E2968:: @ 83E2968
+gPowderParticlesAnimCmds:: @ 83E2968
obj_image_anim_frame 0x0000, 5
obj_image_anim_frame 0x0002, 5
obj_image_anim_frame 0x0004, 5
@@ -20,17 +20,17 @@ gUnknown_83E2968:: @ 83E2968
obj_image_anim_frame 0x000e, 5
obj_image_anim_jump 0x0000
-gUnknown_83E298C:: @ 83E298C
- .4byte gUnknown_83E2968
+gPowderParticlesAnimTable:: @ 83E298C
+ .4byte gPowderParticlesAnimCmds
-gUnknown_83E2990:: @ 83E2990
- spr_template 10067, 10067, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
+gSleepPowderParticleSpriteTemplate:: @ 83E2990
+ spr_template 10067, 10067, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
-gUnknown_83E29A8:: @ 83E29A8
- spr_template 10068, 10068, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
+gStunSporeParticleSpriteTemplate:: @ 83E29A8
+ spr_template 10068, 10068, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
-gUnknown_83E29C0:: @ 83E29C0
- spr_template 10065, 10065, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
+gPoisonPowderParticleSpriteTemplate:: @ 83E29C0
+ spr_template 10065, 10065, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
gAnimCmd_83E29D8:: @ 83E29D8
obj_image_anim_frame 0, 1
@@ -90,54 +90,54 @@ gAffineAnimCmd_83E2A44:: @ 83E2A44
gSpriteAffineAnimTable_83E2A54:: @ 83E2A54
.4byte gAffineAnimCmd_83E2A44
-gUnknown_83E2A58:: @ 83E2A58
- spr_template 10147, 10147, gOamData_83ACB50, gSpriteAnimTable_83E2A40, NULL, gSpriteAffineAnimTable_83E2A54, sub_80A2388
+gPowerAbsorptionOrbSpriteTemplate:: @ 83E2A58
+ spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gSpriteAffineAnimTable_83E2A54, sub_80A2388
-gUnknown_83E2A70:: @ 83E2A70
- spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A23D8
+gSolarbeamBigOrbSpriteTemplate:: @ 83E2A70
+ spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A23D8
-gUnknown_83E2A88:: @ 83E2A88
- spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430
+gSolarbeamSmallOrbSpriteTemplate:: @ 83E2A88
+ spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430
-gUnknown_83E2AA0:: @ 83E2AA0
+gStockpileAbsorptionOrbAffineCmds:: @ 83E2AA0
obj_rot_scal_anim_frame 320, 320, 0, 0
obj_rot_scal_anim_frame -14, -14, 0, 1
obj_rot_scal_anim_jump 1
-gUnknown_83E2AB8:: @ 83E2AB8
- .4byte gUnknown_83E2AA0
+gStockpileAbsorptionOrbAffineAnimTable:: @ 83E2AB8
+ .4byte gStockpileAbsorptionOrbAffineCmds
-gUnknown_83E2ABC:: @ 83E2ABC
- spr_template 10235, 10235, gOamData_83ACA88, gDummySpriteAnimTable, NULL, gUnknown_83E2AB8, sub_80A2388
+gStockpileAbsorptionOrbSpriteTemplate:: @ 83E2ABC
+ spr_template 10235, 10235, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gStockpileAbsorptionOrbAffineAnimTable, sub_80A2388
-gUnknown_83E2AD4:: @ 83E2AD4
+gAbsorptionOrbAffineAnimCmds:: @ 83E2AD4
obj_rot_scal_anim_frame -5, -5, 0, 1
obj_rot_scal_anim_jump 0
-gUnknown_83E2AE4:: @ 83E2AE4
- .4byte gUnknown_83E2AD4
+gAbsorptionOrbAffineAnimTable:: @ 83E2AE4
+ .4byte gAbsorptionOrbAffineAnimCmds
-gUnknown_83E2AE8:: @ 83E2AE8
- spr_template 10147, 10147, gOamData_83ACB50, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2AE4, sub_80A2580
+gAbsorptionOrbSpriteTemplate:: @ 83E2AE8
+ spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gAbsorptionOrbAffineAnimTable, sub_80A2580
-gUnknown_83E2B00:: @ 83E2B00
- spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC
+gHyperBeamOrbSpriteTemplate:: @ 83E2B00
+ spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC
-gUnknown_83E2B18:: @ 83E2B18
+gLeechSeedAnimCmds1:: @ 83E2B18
obj_image_anim_frame 0, 1
obj_image_anim_end
-gUnknown_83E2B20:: @ 83E2B20
+gLeechSeedAnimCmds2:: @ 83E2B20
obj_image_anim_frame 4, 7
obj_image_anim_frame 8, 7
obj_image_anim_jump 0
-gUnknown_83E2B2C:: @ 83E2B2C
- .4byte gUnknown_83E2B18
- .4byte gUnknown_83E2B20
+gLeechSeedAnimTable:: @ 83E2B2C
+ .4byte gLeechSeedAnimCmds1
+ .4byte gLeechSeedAnimCmds2
-gUnknown_83E2B34:: @ 83E2B34
- spr_template 10006, 10006, gOamData_83AC9D0, gUnknown_83E2B2C, NULL, gDummySpriteAffineAnimTable, sub_80A26F0
+gLeechSeedSpriteTemplate:: @ 83E2B34
+ spr_template 10006, 10006, gOamData_AffineOff_ObjNormal_16x16, gLeechSeedAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A26F0
gUnknown_83E2B4C:: @ 83E2B4C
obj_image_anim_frame 0, 1
@@ -152,7 +152,7 @@ gUnknown_83E2B5C:: @ 83E2B5C
.4byte gUnknown_83E2B54
gUnknown_83E2B64:: @ 83E2B64
- spr_template 10158, 10158, gOamData_83AC9D0, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0
+ spr_template 10158, 10158, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0
gUnknown_83E2B7C:: @ 83E2B7C
obj_image_anim_frame 0, 1
@@ -169,10 +169,10 @@ gUnknown_83E2B90:: @ 83E2B90
.4byte gUnknown_83E2B84
gUnknown_83E2B94:: @ 83E2B94
- spr_template 10159, 10159, gOamData_83AC9D0, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920
+ spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920
gUnknown_83E2BAC:: @ 83E2BAC
- spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC
+ spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC
gUnknown_83E2BC4:: @ 83E2BC4
obj_image_anim_frame 0, 5
@@ -198,10 +198,10 @@ gUnknown_83E2C00:: @ 83E2C00
.4byte gUnknown_83E2BF0
gUnknown_83E2C08:: @ 83E2C08
- spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4
+ spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4
gUnknown_83E2C20:: @ 83E2C20
- spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle
+ spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle
gUnknown_83E2C38:: @ 83E2C38
obj_image_anim_frame 0, 3
@@ -214,7 +214,7 @@ gUnknown_83E2C4C:: @ 83E2C4C
.4byte gUnknown_83E2C38
gUnknown_83E2C50:: @ 83E2C50
- spr_template 10160, 10160, gOamData_83AC9F8, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C
+ spr_template 10160, 10160, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C
gUnknown_83E2C68:: @ 83E2C68
obj_rot_scal_anim_frame 0, 0, 0, 1
@@ -224,7 +224,7 @@ gUnknown_83E2C78:: @ 83E2C78
.4byte gUnknown_83E2C68
gUnknown_83E2C7C:: @ 83E2C7C
- spr_template 10174, 10174, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C
+ spr_template 10174, 10174, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C
gUnknown_83E2C94:: @ 83E2C94
obj_image_anim_frame 0, 4
@@ -261,7 +261,7 @@ gUnknown_83E2D04:: @ 83E2D04
.4byte gUnknown_83E2CE4
gUnknown_83E2D0C:: @ 83E2D0C
- spr_template 10186, 10186, gOamData_83ACA60, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28
+ spr_template 10186, 10186, gOamData_AffineNormal_ObjNormal_64x32, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28
gUnknown_83E2D24:: @ 83E2D24
obj_rot_scal_anim_frame 0, 0, 0, 0
@@ -277,7 +277,7 @@ gUnknown_83E2D4C:: @ 83E2D4C
.4byte gUnknown_83E2D3C
gUnknown_83E2D54:: @ 83E2D54
- spr_template 10147, 10147, gOamData_83ACA90, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098
+ spr_template 10147, 10147, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098
gUnknown_83E2D6C:: @ 83E2D6C
obj_image_anim_frame 0, 7
@@ -312,10 +312,10 @@ gUnknown_83E2DB4:: @ 83E2DB4
.4byte gUnknown_83E2DA4
gUnknown_83E2DC4:: @ 83E2DC4
- spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168
+ spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168
gUnknown_83E2DDC:: @ 83E2DDC
- spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC
+ spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC
gUnknown_83E2DF4:: @ 83E2DF4
obj_image_anim_frame 3, 3
@@ -326,7 +326,7 @@ gUnknown_83E2E00:: @ 83E2E00
.4byte gUnknown_83E2DF4
gUnknown_83E2E04:: @ 83E2E04
- spr_template 10147, 10147, gOamData_83AC9C8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334
+ spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334
gUnknown_83E2E1C:: @ 83E2E1C
obj_image_anim_frame 0, 30
@@ -355,10 +355,10 @@ gUnknown_83E2E80:: @ 83E2E80
.4byte gUnknown_83E2E48
gUnknown_83E2E88:: @ 83E2E88
- spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518
+ spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518
gUnknown_83E2EA0:: @ 83E2EA0
- spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4
+ spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4
gUnknown_83E2EB8:: @ 83E2EB8
obj_image_anim_frame 0, 4
@@ -371,10 +371,10 @@ gUnknown_83E2ECC:: @ 83E2ECC
.4byte gUnknown_83E2EB8
gUnknown_83E2ED0:: @ 83E2ED0
- spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670
+ spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670
gUnknown_83E2EE8:: @ 83E2EE8
- spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4
+ spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4
gUnknown_83E2F00:: @ 83E2F00
obj_rot_scal_anim_frame 0, 0, 0, 3
@@ -397,7 +397,7 @@ gUnknown_83E2F50:: @ 83E2F50
.4byte gUnknown_83E2E48
gUnknown_83E2F60:: @ 83E2F60
- spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC
+ spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC
gUnknown_83E2F78:: @ 83E2F78
.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
@@ -441,7 +441,7 @@ gUnknown_83E2FD4:: @ 83E2FD4
.4byte gUnknown_83E2FCC
gUnknown_83E2FF0:: @ 83E2FF0
- spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E3008:: @ 83E3008
obj_rot_scal_anim_frame 256, 256, 0, 0
@@ -452,10 +452,10 @@ gUnknown_83E3020:: @ 83E3020
.4byte gUnknown_83E3008
gUnknown_83E3024:: @ 83E3024
- spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040
+ spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040
gUnknown_83E303C:: @ 83E303C
- spr_template 10159, 10159, gOamData_83ACA30, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040
+ spr_template 10159, 10159, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040
gUnknown_83E3054:: @ 83E3054
obj_rot_scal_anim_frame 256, 256, 0, 0
@@ -482,19 +482,19 @@ gUnknown_83E30A4:: @ 83E30A4
.4byte gUnknown_83E3084
gUnknown_83E30A8:: @ 83E30A8
- spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040
+ spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040
gUnknown_83E30C0:: @ 83E30C0
- spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E30A0, sub_80A4040
+ spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A0, sub_80A4040
gUnknown_83E30D8:: @ 83E30D8
- spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040
+ spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040
gUnknown_83E30F0:: @ 83E30F0
.2byte 0x001f, 0x027f, 0x03ff, 0x03e0, 0x7dc5, 0x7d56, 0x7eb6, 0x0000
gUnknown_83E3100:: @ 83E3100
- spr_template 10266, 10266, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298
+ spr_template 10266, 10266, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298
gUnknown_83E3118:: @ 83E3118
obj_image_anim_frame 64, 3
@@ -515,10 +515,10 @@ gUnknown_83E3140:: @ 83E3140
.4byte gUnknown_83E312C
gUnknown_83E3148:: @ 83E3148
- spr_template 10056, 10056, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
+ spr_template 10056, 10056, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
gUnknown_83E3160:: @ 83E3160
- spr_template 10287, 10287, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
+ spr_template 10287, 10287, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450
gUnknown_83E3178:: @ 83E3178
obj_image_anim_frame 0x0000, 4
@@ -532,10 +532,10 @@ gUnknown_83E3190:: @ 83E3190
.4byte gUnknown_83E3178
gUnknown_83E3194:: @ 83E3194
- spr_template 10021, 10021, gOamData_83AC9D8, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8
+ spr_template 10021, 10021, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8
gUnknown_83E31AC:: @ 83E31AC
- spr_template 10022, 10022, gOamData_83AC9D8, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8
+ spr_template 10022, 10022, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8
gUnknown_83E31C4:: @ 83E31C4
obj_rot_scal_anim_frame 256, 256, 0, 0
@@ -580,7 +580,7 @@ gUnknown_83E3244::
.4byte gUnknown_83E3234
gUnknown_83E3264::
- spr_template 10143, 10143, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E3244, sub_80A4494
+ spr_template 10143, 10143, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3244, sub_80A4494
gUnknown_83E327C:: @ 83E327C
obj_image_anim_frame 0, 5
@@ -593,10 +593,10 @@ gUnknown_83E3290:: @ 83E3290
.4byte gUnknown_83E327C
gUnknown_83E3294:: @ 83E3294
- spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0
+ spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0
gUnknown_83E32AC:: @ 83E32AC
- spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A4588
+ spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A4588
gUnknown_83E32C4:: @ 83E32C4
obj_image_anim_frame 0x0000, 1
@@ -651,10 +651,10 @@ gUnknown_83E3314::
.4byte gUnknown_83E330C
gUnknown_83E333C::
- spr_template 10072, 10072, gOamData_83AC9D0, gUnknown_83E3314, NULL, gDummySpriteAffineAnimTable, sub_80A481C
+ spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3314, NULL, gDummySpriteAffineAnimTable, sub_80A481C
gUnknown_83E3354:: @ 83E3354
- spr_template 10280, 10280, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0
+ spr_template 10280, 10280, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0
gUnknown_83E336C:: @ 83E336C
obj_rot_scal_anim_frame 256, 256, 0, 0
@@ -673,7 +673,7 @@ gUnknown_83E33AC:: @ 83E33AC
.4byte gUnknown_83E337C
gUnknown_83E33B4:: @ 83E33B4
- spr_template 10099, 10099, gOamData_83ACB58, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC
+ spr_template 10099, 10099, gOamData_AffineNormal_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC
gUnknown_83E33CC:: @ 83E33CC
obj_image_anim_frame 0, 7
@@ -690,10 +690,10 @@ gUnknown_83E33F0:: @ 83E33F0
.4byte gUnknown_83E33CC
gUnknown_83E33F4:: @ 83E33F4
- spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C
+ spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C
gUnknown_83E340C:: @ 83E340C
- spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C
+ spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C
gUnknown_83E3424:: @ 83E3424
obj_image_anim_frame 0x0000, 10
@@ -722,7 +722,7 @@ gUnknown_83E346C::
.4byte gUnknown_83E3448
gUnknown_83E3474::
- spr_template 10032, 10032, gOamData_83AC9D0, gUnknown_83E346C, NULL, gDummySpriteAffineAnimTable, sub_80A4E40
+ spr_template 10032, 10032, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E346C, NULL, gDummySpriteAffineAnimTable, sub_80A4E40
gUnknown_83E348C:: @ 83E348C
obj_image_anim_frame 0, 40
@@ -756,13 +756,13 @@ gUnknown_83E34F8:: @ 83E34F8
.4byte gUnknown_83E34C8
gUnknown_83E3500:: @ 83E3500
- spr_template 10228, 10228, gOamData_83ACA38, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4
+ spr_template 10228, 10228, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4
gUnknown_83E3518:: @ 83E3518
- spr_template 10014, 10014, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4FAC
+ spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4FAC
gUnknown_83E3530:: @ 83E3530
- spr_template 10014, 10014, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298
+ spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298
gUnknown_83E3548:: @ 83E3548
.byte 0x40, 0x40, 0x00, 0xc0, 0xc0, 0x40, 0x20, 0xe0
@@ -787,13 +787,13 @@ gUnknown_83E359C:: @ 83E359C
.4byte gUnknown_83E3594
gUnknown_83E35A4:: @ 83E35A4
- spr_template 10183, 10183, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940
+ spr_template 10183, 10183, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940
gUnknown_83E35BC:: @ 83E35BC
- spr_template 10286, 10286, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59A8
+ spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59A8
gUnknown_83E35D4:: @ 83E35D4
- spr_template 10286, 10286, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0
+ spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0
gUnknown_83E35EC:: @ 83E35EC
obj_image_anim_frame 0, 4
@@ -806,7 +806,7 @@ gUnknown_83E3600:: @ 83E3600
.4byte gUnknown_83E35EC
gUnknown_83E3604:: @ 83E3604
- spr_template 10184, 10184, gOamData_83ACA18, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8
+ spr_template 10184, 10184, gOamData_AffineOff_ObjNormal_16x32, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8
gUnknown_83E361C:: @ 83E361C
obj_image_anim_frame 0, 18
@@ -829,10 +829,10 @@ gUnknown_83E3658:: @ 83E3658
.4byte gUnknown_83E361C
gUnknown_83E365C:: @ 83E365C
- spr_template 10185, 10185, gOamData_83AC9D8, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C
+ spr_template 10185, 10185, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C
gUnknown_83E3674:: @ 83E3674
- spr_template 10017, 10017, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
+ spr_template 10017, 10017, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E368C:: @ 83E368C
obj_image_anim_frame 0, 3
@@ -846,7 +846,7 @@ gUnknown_83E36A4:: @ 83E36A4
.4byte gUnknown_83E368C
gUnknown_83E36A8:: @ 83E36A8
- spr_template 10030, 10030, gOamData_83AC9D8, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
+ spr_template 10030, 10030, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E36C0:: @ 83E36C0
obj_image_anim_frame 3, 5
@@ -866,7 +866,7 @@ gUnknown_83E36E8:: @ 83E36E8
.4byte gUnknown_83E36D8
gUnknown_83E36EC:: @ 83E36EC
- spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68
+ spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68
gUnknown_83E3704:: @ 83E3704
obj_image_anim_frame 0, 5
@@ -879,10 +879,10 @@ gUnknown_83E3718:: @ 83E3718
.4byte gUnknown_83E3704
gUnknown_83E371C:: @ 83E371C
- spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C
+ spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C
gUnknown_83E3734:: @ 83E3734
- spr_template 10194, 10194, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0
+ spr_template 10194, 10194, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0
gUnknown_83E374C:: @ 83E374C
obj_image_anim_frame 0, 8
@@ -895,7 +895,7 @@ gUnknown_83E3760:: @ 83E3760
.4byte gUnknown_83E374C
gUnknown_83E3764:: @ 83E3764
- spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40
+ spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40
gUnknown_83E377C:: @ 83E377C
obj_image_anim_frame 0, 2
@@ -912,10 +912,10 @@ gUnknown_83E37A0:: @ 83E37A0
.4byte gUnknown_83E377C
gUnknown_83E37A4:: @ 83E37A4
- spr_template 10031, 10031, gOamData_83AC9D8, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
+ spr_template 10031, 10031, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E37BC:: @ 83E37BC
- spr_template 10020, 10020, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244
+ spr_template 10020, 10020, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244
gUnknown_83E37D4:: @ 83E37D4
obj_image_anim_frame 0, 2
@@ -928,7 +928,7 @@ gUnknown_83E37E8:: @ 83E37E8
.4byte gUnknown_83E37D4
gUnknown_83E37EC:: @ 83E37EC
- spr_template 10192, 10192, gOamData_83AC9D8, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC
+ spr_template 10192, 10192, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC
gUnknown_83E3804:: @ 83E3804
obj_image_anim_frame 0x0000, 10
@@ -974,17 +974,17 @@ gUnknown_83E387C:: @ 83E387C
.4byte gUnknown_83E3864
gUnknown_83E3880:: @ 83E3880
- spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4
+ spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4
gUnknown_83E3898:: @ 83E3898
.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
+ spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A68B0
gUnknown_83E38E0:: @ 83E38E0
- spr_template 10193, 10193, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8
+ spr_template 10193, 10193, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8
gUnknown_83E38F8:: @ 83E38F8
obj_rot_scal_anim_frame 160, 160, 0, 0
@@ -995,7 +995,7 @@ gUnknown_83E3910:: @ 83E3910
.4byte gUnknown_83E38F8
gUnknown_83E3914:: @ 83E3914
- spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28
+ spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28
gUnknown_83E392C:: @ 83E392C
obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -1032,7 +1032,7 @@ gUnknown_83E397C:: @ 83E397C
.4byte gUnknown_83E3968
gUnknown_83E398C:: @ 83E398C
- spr_template 10209, 10209, gOamData_83AC9D8, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64
+ spr_template 10209, 10209, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64
gUnknown_83E39A4:: @ 83E39A4
obj_rot_scal_anim_frame 16, 16, 0, 0
@@ -1062,10 +1062,10 @@ gUnknown_83E3A2C:: @ 83E3A2C
.4byte gUnknown_83E39BC
gUnknown_83E3A34:: @ 83E3A34
- spr_template 10064, 10064, gOamData_83ACA98, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08
+ spr_template 10064, 10064, gOamData_AffineDouble_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08
gUnknown_83E3A4C:: @ 83E3A4C
- spr_template 10064, 10064, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84
+ spr_template 10064, 10064, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84
gUnknown_83E3A64:: @ 83E3A64
obj_image_anim_frame 0, 1
@@ -1102,10 +1102,10 @@ gUnknown_83E3AB4:: @ 83E3AB4
.4byte gUnknown_83E3A94
gUnknown_83E3AC4:: @ 83E3AC4
- spr_template 10214, 10214, gOamData_83AC9D8, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90
+ spr_template 10214, 10214, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90
gUnknown_83E3ADC::
- spr_template 10064, 10064, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48
+ spr_template 10064, 10064, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48
gUnknown_83E3AF4:: @ 83E3AF4
obj_image_anim_frame 0x0004, 1
@@ -1115,13 +1115,13 @@ gUnknown_83E3AFC::
.4byte gUnknown_83E3AF4
gUnknown_83E3B00::
- spr_template 10072, 10072, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E98
+ spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E98
gUnknown_83E3B18::
spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6F8C
gUnknown_83E3B30::
- spr_template 10145, 10145, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E7910, sub_80A7020
+ spr_template 10145, 10145, gOamData_AffineNormal_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E7910, sub_80A7020
gUnknown_83E3B48::
obj_image_anim_frame 0x0000, 9
@@ -1142,7 +1142,7 @@ gUnknown_83E3B78::
.4byte gUnknown_83E3B60
gUnknown_83E3B7C::
- spr_template 10007, 10007, gOamData_83ACA38, gUnknown_83E3B5C, NULL, gUnknown_83E3B78, AnimSpriteOnMonPos
+ spr_template 10007, 10007, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3B5C, NULL, gUnknown_83E3B78, AnimSpriteOnMonPos
gUnknown_83E3B94:: @ 83E3B94
obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
@@ -1159,7 +1159,7 @@ gUnknown_83E3BB8:: @ 83E3BB8
.4byte gUnknown_83E3B94
gUnknown_83E3BBC:: @ 83E3BBC
- spr_template 10075, 10075, gOamData_83AC9F8, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8
+ spr_template 10075, 10075, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8
gUnknown_83E3BD4:: @ 83E3BD4
obj_rot_scal_anim_frame 16, 256, 0, 0
@@ -1171,13 +1171,13 @@ gUnknown_83E3BF4:: @ 83E3BF4
.4byte gUnknown_83E3BD4
gUnknown_83E3BF8:: @ 83E3BF8
- spr_template 10005, 10005, gOamData_83ACBA0, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C
+ spr_template 10005, 10005, gOamData_AffineNormal_ObjBlend_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C
gUnknown_83E3C10:: @ 83E3C10
- spr_template 10003, 10003, gOamData_83ACBD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A72C8
+ spr_template 10003, 10003, gOamData_AffineDouble_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A72C8
gUnknown_83E3C28:: @ 83E3C28
- spr_template 10003, 10003, gOamData_83ACB18, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4
+ spr_template 10003, 10003, gOamData_AffineOff_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4
gUnknown_83E3C40:: @ 83E3C40
obj_rot_scal_anim_frame 32, 32, 0, 0
@@ -1201,22 +1201,22 @@ gUnknown_83E3C9C:: @ 83E3C9C
.4byte gUnknown_83E3C58
gUnknown_83E3CA0:: @ 83E3CA0
- spr_template 10163, 10163, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
+ spr_template 10163, 10163, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E3CB8:: @ 83E3CB8
- spr_template 10164, 10164, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
+ spr_template 10164, 10164, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E3CD0:: @ 83E3CD0
- spr_template 10260, 10260, gOamData_83ACAE0, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
+ spr_template 10260, 10260, gOamData_AffineDouble_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation
gUnknown_83E3CE8:: @ 83E3CE8
- spr_template 10288, 10288, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C9C, sub_80AC6D8
+ spr_template 10288, 10288, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C9C, sub_80AC6D8
gUnknown_83E3D00:: @ 83E3D00
- spr_template 10175, 10175, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile
+ spr_template 10175, 10175, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile
gUnknown_83E3D18:: @ 83E3D18
- spr_template 10178, 10178, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8
+ spr_template 10178, 10178, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8
gUnknown_83E3D30:: @ 83E3D30
obj_image_anim_frame 8, 1
@@ -1233,10 +1233,10 @@ gUnknown_83E3D4C:: @ 83E3D4C
.4byte gUnknown_83E3D3C
gUnknown_83E3D50:: @ 83E3D50
- spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88
+ spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88
gUnknown_83E3D68:: @ 83E3D68
- spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C
+ spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C
gUnknown_83E3D80:: @ 83E3D80
obj_rot_scal_anim_frame 0, 0, 20, 1
@@ -1246,7 +1246,7 @@ gUnknown_83E3D90:: @ 83E3D90
.4byte gUnknown_83E3D80
gUnknown_83E3D94:: @ 83E3D94
- spr_template 10006, 10006, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4
+ spr_template 10006, 10006, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4
gUnknown_83E3DAC:: @ 83E3DAC
obj_rot_scal_anim_frame 16, 256, 0, 0
@@ -1257,7 +1257,7 @@ gUnknown_83E3DC4:: @ 83E3DC4
.4byte gUnknown_83E3DAC
gUnknown_83E3DC8:: @ 83E3DC8
- spr_template 10009, 10009, gOamData_83ACA80, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04
+ spr_template 10009, 10009, gOamData_AffineNormal_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04
gUnknown_83E3DE0:: @ 83E3DE0
obj_image_anim_frame 0, 3
@@ -1276,7 +1276,7 @@ gUnknown_83E3E00:: @ 83E3E00
.4byte gUnknown_83E3DF0
gUnknown_83E3E08:: @ 83E3E08
- spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64
+ spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64
gUnknown_83E3E20:: @ 83E3E20
obj_image_anim_frame 0, 2
@@ -1295,7 +1295,7 @@ gUnknown_83E3E40:: @ 83E3E40
.4byte gUnknown_83E3E30
gUnknown_83E3E48:: @ 83E3E48
- spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14
+ spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14
gUnknown_83E3E60:: @ 83E3E60
obj_rot_scal_anim_frame -6, 4, 0, 8
@@ -1328,7 +1328,7 @@ gUnknown_83E3EC8:: @ 83E3EC8
.4byte gUnknown_83E3EB4
gUnknown_83E3ED0:: @ 83E3ED0
- spr_template 10086, 10086, gOamData_83AC9D0, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C
+ spr_template 10086, 10086, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C
gUnknown_83E3EE8:: @ 83E3EE8
obj_rot_scal_anim_frame 11, 11, 0, 8
@@ -1339,7 +1339,7 @@ gUnknown_83E3F00:: @ 83E3F00
.4byte gUnknown_83E3EE8
gUnknown_83E3F04:: @ 83E3F04
- spr_template 10087, 10087, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC
+ spr_template 10087, 10087, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC
gUnknown_83E3F1C:: @ 83E3F1C
obj_rot_scal_anim_frame -10, 9, 0, 7
@@ -1350,10 +1350,10 @@ gUnknown_83E3F1C:: @ 83E3F1C
obj_rot_scal_anim_end
gUnknown_83E3F4C:: @ 83E3F4C
- spr_template 10002, 10002, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C
+ spr_template 10002, 10002, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C
gUnknown_83E3F64:: @ 83E3F64
- spr_template 10197, 10197, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ
+ spr_template 10197, 10197, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ
gUnknown_83E3F7C:: @ 83E3F7C
obj_image_anim_frame 0, 5
@@ -1366,7 +1366,7 @@ gUnknown_83E3F90:: @ 83E3F90
.4byte gUnknown_83E3F7C
gUnknown_83E3F94:: @ 83E3F94
- spr_template 10198, 10198, gOamData_83AC9D8, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
+ spr_template 10198, 10198, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E3FAC:: @ 83E3FAC
obj_rot_scal_anim_frame 0, 0, 248, 2
@@ -1394,7 +1394,7 @@ gUnknown_83E401C:: @ 83E401C
.4byte gUnknown_83E3FDC
gUnknown_83E4028:: @ 83E4028
- spr_template 10202, 10202, gOamData_83ACBB8, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38
+ spr_template 10202, 10202, gOamData_AffineDouble_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38
gUnknown_83E4040:: @ 83E4040
obj_rot_scal_anim_frame 16, 16, 0, 0
@@ -1419,7 +1419,7 @@ gUnknown_83E4090:: @ 83E4090
.4byte gUnknown_83E4070
gUnknown_83E4094:: @ 83E4094
- spr_template 10203, 10203, gOamData_83ACAA0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos
+ spr_template 10203, 10203, gOamData_AffineDouble_ObjNormal_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos
gUnknown_83E40AC:: @ 83E40AC
obj_rot_scal_anim_frame 512, 512, 0, 0
@@ -1430,16 +1430,16 @@ gUnknown_83E40C4:: @ 83E40C4
.4byte gUnknown_83E40AC
gUnknown_83E40C8:: @ 83E40C8
- spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos
+ spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos
gUnknown_83E40E0:: @ 83E40E0
- spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8BC4
+ spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8BC4
gUnknown_83E40F8:: @ 83E40F8
- spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4090, sub_80A8CA4
+ spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4090, sub_80A8CA4
gUnknown_83E4110:: @ 83E4110
- spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8
+ spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8
gUnknown_83E4128:: @ 83E4128
obj_rot_scal_anim_frame 96, -13, 0, 8
@@ -1457,7 +1457,7 @@ gUnknown_83E4150:: @ 83E4150
.4byte gUnknown_83E4138
gUnknown_83E4154:: @ 83E4154
- spr_template 10207, 10207, gOamData_83AC9D0, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648
+ spr_template 10207, 10207, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648
gUnknown_83E416C:: @ 83E416C
.byte 0x1e, 0x1c, 0xec, 0x18, 0x10, 0x1a, 0xf6, 0x1c
@@ -1482,17 +1482,17 @@ gUnknown_83E41AC:: @ 83E41AC
.4byte gUnknown_83E4174
gUnknown_83E41B0:: @ 83E41B0
- spr_template 10205, 10205, gOamData_83AC9D8, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
+ spr_template 10205, 10205, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
gUnknown_83E41C8:: @ 83E41C8
.2byte 10206, 9999, 9998
.align 2
gUnknown_83E41D0:: @ 83E41D0
- spr_template 10206, 10206, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A97E8
+ spr_template 10206, 10206, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A97E8
gUnknown_83E41E8:: @ 83E41E8
- spr_template 10210, 10210, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9860
+ spr_template 10210, 10210, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9860
gUnknown_83E4200:: @ 83E4200
obj_rot_scal_anim_frame 10, -13, 0, 10
@@ -1500,13 +1500,13 @@ gUnknown_83E4200:: @ 83E4200
obj_rot_scal_anim_end
gUnknown_83E4218:: @ 83E4218
- spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9B40
+ spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9B40
gUnknown_83E4230:: @ 83E4230
- spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9BC4
+ spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9BC4
gUnknown_83E4248:: @ 83E4248
- spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C
+ spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C
gUnknown_83E4260:: @ 83E4260
obj_rot_scal_anim_frame 128, 128, 0, 0
@@ -1517,10 +1517,10 @@ gUnknown_83E4278:: @ 83E4278
.4byte gUnknown_83E4260
gUnknown_83E427C:: @ 83E427C
- spr_template 10217, 10217, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174
+ spr_template 10217, 10217, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174
gUnknown_83E4294:: @ 83E4294
- spr_template 10217, 10217, gOamData_83ACA90, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0
+ spr_template 10217, 10217, gOamData_AffineDouble_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0
gUnknown_83E42AC:: @ 83E42AC
obj_rot_scal_anim_frame 128, 128, 0, 0
@@ -1531,7 +1531,7 @@ gUnknown_83E42C4:: @ 83E42C4
.4byte gUnknown_83E42AC
gUnknown_83E42C8:: @ 83E42C8
- spr_template 10237, 10237, gOamData_83ACA88, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C
+ spr_template 10237, 10237, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C
gUnknown_83E42E0:: @ 83E42E0
obj_image_anim_frame 0, 4
@@ -1545,7 +1545,7 @@ gUnknown_83E42F8:: @ 83E42F8
.4byte gUnknown_83E42E0
gUnknown_83E42FC:: @ 83E42FC
- spr_template 10218, 10218, gOamData_83AC9D0, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0
+ spr_template 10218, 10218, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0
gUnknown_83E4314:: @ 83E4314
obj_image_anim_frame 0, 24
@@ -1555,10 +1555,10 @@ gUnknown_83E431C:: @ 83E431C
.4byte gUnknown_83E4314
gUnknown_83E4320:: @ 83E4320
- spr_template 10220, 10220, gOamData_83AC9D8, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408
+ spr_template 10220, 10220, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408
gUnknown_83E4338:: @ 83E4338
- spr_template 10219, 10219, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508
+ spr_template 10219, 10219, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508
gUnknown_83E4350:: @ 83E4350
obj_image_anim_frame 0, 3
@@ -1573,7 +1573,7 @@ gUnknown_83E4360:: @ 83E4360
.4byte gUnknown_83E4358
gUnknown_83E4368:: @ 83E4368
- spr_template 10221, 10221, gOamData_83AC9D8, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C
+ spr_template 10221, 10221, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C
gUnknown_83E4380:: @ 83E4380
obj_image_anim_frame 0, 4
@@ -1594,7 +1594,7 @@ gUnknown_83E43A8:: @ 83E43A8
.4byte gUnknown_83E4394
gUnknown_83E43B0:: @ 83E43B0
- spr_template 10222, 10222, gOamData_83AC9D8, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8
+ spr_template 10222, 10222, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8
gUnknown_83E43C8:: @ 83E43C8
obj_image_anim_frame 0, 8
@@ -1615,7 +1615,7 @@ gUnknown_83E43F0:: @ 83E43F0
.4byte gUnknown_83E43DC
gUnknown_83E43F8:: @ 83E43F8
- spr_template 10215, 10215, gOamData_83AC9D8, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708
+ spr_template 10215, 10215, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708
gUnknown_83E4410:: @ 83E4410
obj_rot_scal_anim_frame -12, 8, 0, 4
@@ -1624,7 +1624,7 @@ gUnknown_83E4410:: @ 83E4410
obj_rot_scal_anim_end
gUnknown_83E4430:: @ 83E4430
- spr_template 10225, 10225, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838
+ spr_template 10225, 10225, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838
gUnknown_83E4448:: @ 83E4448
obj_rot_scal_anim_frame 0, 0, 0, 5
@@ -1644,10 +1644,10 @@ gUnknown_83E4478:: @ 83E4478
.4byte gUnknown_83E4468
gUnknown_83E4484:: @ 83E4484
- spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998
+ spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998
gUnknown_83E449C:: @ 83E449C
- spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938
+ spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938
gUnknown_83E44B4:: @ 83E44B4
obj_rot_scal_anim_frame 256, 256, 0, 0
@@ -1662,7 +1662,7 @@ gUnknown_83E44D4:: @ 83E44D4
.4byte gUnknown_83E44C4
gUnknown_83E44DC:: @ 83E44DC
- spr_template 10244, 10244, gOamData_83ACBE0, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4
+ spr_template 10244, 10244, gOamData_AffineDouble_ObjBlend_64x32, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4
gUnknown_83E44F4:: @ 83E44F4
.incbin "graphics/battle_anims/unk_83E4874.4bpp"
@@ -1684,7 +1684,7 @@ gUnknown_83E5894:: @ 83E5894
.4byte gUnknown_83E5874
gUnknown_83E5898:: @ 83E5898
- spr_template 10115, 10115, gOamData_83ACA18, gUnknown_83E5894, NULL, gDummySpriteAffineAnimTable, sub_80AAC54
+ spr_template 10115, 10115, gOamData_AffineOff_ObjNormal_16x32, gUnknown_83E5894, NULL, gDummySpriteAffineAnimTable, sub_80AAC54
gUnknown_83E58B0:: @ 83E58B0
obj_rot_scal_anim_frame -5, -5, 0, 10
@@ -1704,7 +1704,7 @@ gUnknown_83E58DC:: @ 83E58DC
.4byte gUnknown_83E58CC
gUnknown_83E58E0:: @ 83E58E0
- spr_template 10146, 10146, gOamData_83ACB50, gUnknown_83E58DC, NULL, gUnknown_83E58C8, sub_80AAC98
+ spr_template 10146, 10146, gOamData_AffineNormal_ObjBlend_16x16, gUnknown_83E58DC, NULL, gUnknown_83E58C8, sub_80AAC98
gUnknown_83E58F8:: @ 83E58F8
obj_image_anim_frame 0, 1
@@ -1727,7 +1727,7 @@ gUnknown_83E5928:: @ 83E5928
.4byte gUnknown_83E5910
gUnknown_83E592C:: @ 83E592C
- spr_template 10140, 10140, gOamData_83ACAC8, gUnknown_83E5908, NULL, gUnknown_83E5928, sub_80AAE84
+ spr_template 10140, 10140, gOamData_AffineDouble_ObjNormal_8x16, gUnknown_83E5908, NULL, gUnknown_83E5928, sub_80AAE84
gUnknown_83E5944:: @ 83E5944
obj_image_anim_frame 0, 1
@@ -1740,16 +1740,16 @@ gUnknown_83E5958:: @ 83E5958
.4byte gUnknown_83E5944
gUnknown_83E595C:: @ 83E595C
- spr_template 10149, 10149, gOamData_83ACAF0, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024
+ spr_template 10149, 10149, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E5974:: @ 83E5974
- spr_template 10259, 10259, gOamData_83ACAF0, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024
+ spr_template 10259, 10259, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E598C:: @ 83E598C
- spr_template 10264, 10264, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024
+ spr_template 10264, 10264, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E59A4:: @ 83E59A4
- spr_template 10265, 10265, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024
+ spr_template 10265, 10265, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E59BC:: @ 83E59BC
obj_image_anim_frame 16, 2
@@ -1761,10 +1761,10 @@ gUnknown_83E59CC:: @ 83E59CC
.4byte gUnknown_83E59BC
gUnknown_83E59D0:: @ 83E59D0
- spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024
+ spr_template 10029, 10029, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E59E8:: @ 83E59E8
- spr_template 10165, 10165, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024
+ spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024
gUnknown_83E5A00:: @ 83E5A00
obj_rot_scal_anim_frame 3, 3, 10, 50
@@ -1783,10 +1783,10 @@ gUnknown_83E5A34:: @ 83E5A34
.4byte gUnknown_83E5A20
gUnknown_83E5A38:: @ 83E5A38
- spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A30, sub_80AB168
+ spr_template 10149, 10149, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5958, NULL, gUnknown_83E5A30, sub_80AB168
gUnknown_83E5A50:: @ 83E5A50
- spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A34, sub_80AB1F8
+ spr_template 10149, 10149, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5958, NULL, gUnknown_83E5A34, sub_80AB1F8
gUnknown_83E5A68:: @ 83E5A68
obj_image_anim_frame 0, 1
@@ -1803,19 +1803,19 @@ gUnknown_83E5A7C:: @ 83E5A7C
.4byte gUnknown_83E5A70
gUnknown_83E5A80:: @ 83E5A80
- spr_template 10155, 10155, gOamData_83ACAF0, gUnknown_83E5A78, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile
+ spr_template 10155, 10155, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5A78, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile
gUnknown_83E5A98:: @ 83E5A98
- spr_template 10155, 10155, gOamData_83ACBB0, gUnknown_83E5A7C, NULL, gUnknown_83E6A80, sub_80AB2CC
+ spr_template 10155, 10155, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5A7C, NULL, gUnknown_83E6A80, sub_80AB2CC
gUnknown_83E5AB0:: @ 83E5AB0
- spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6330, NULL, gDummySpriteAffineAnimTable, sub_80AB308
+ spr_template 10141, 10141, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E6330, NULL, gDummySpriteAffineAnimTable, sub_80AB308
gUnknown_83E5AC8:: @ 83E5AC8
- spr_template 10155, 10155, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABA78
+ spr_template 10155, 10155, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABA78
gUnknown_83E5AE0:: @ 83E5AE0
- spr_template 10268, 10268, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABF60
+ spr_template 10268, 10268, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABF60
gUnknown_83E5AF8:: @ 83E5AF8
obj_image_anim_frame 8, 1
@@ -1859,10 +1859,10 @@ gUnknown_83E5B6C:: @ 83E5B6C
.4byte gUnknown_83E5B4C
gUnknown_83E5B70:: @ 83E5B70
- spr_template 10155, 10155, gOamData_83AC9C8, gUnknown_83E5B10, NULL, gDummySpriteAffineAnimTable, sub_80AC624
+ spr_template 10155, 10155, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E5B10, NULL, gDummySpriteAffineAnimTable, sub_80AC624
gUnknown_83E5B88:: @ 83E5B88
- spr_template 10155, 10155, gOamData_83ACA28, gUnknown_83E5B10, NULL, gUnknown_83E5B64, sub_80AC698
+ spr_template 10155, 10155, gOamData_AffineNormal_ObjNormal_8x8, gUnknown_83E5B10, NULL, gUnknown_83E5B64, sub_80AC698
gUnknown_83E5BA0:: @ 83E5BA0
- spr_template 10155, 10155, gOamData_83ACA30, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350
+ spr_template 10155, 10155, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index cf4cf25cb..66ff25ced 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -460,72 +460,72 @@ Move_POISON_POWDER:: @ 81C6FB8
loadspritegfx 10065
loadspritegfx 10150
loopsewithpan SE_W077, 63, 10, 6
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
delay 15
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
delay 30
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
delay 20
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
- createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
waitforvisualfinish
end
Move_STUN_SPORE:: @ 81C70E9
loadspritegfx 10068
loopsewithpan SE_W077, 63, 10, 6
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
delay 15
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
delay 30
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
delay 20
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
- createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
+ createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
waitforvisualfinish
end
Move_SLEEP_POWDER:: @ 81C7217
loadspritegfx 10067
loopsewithpan SE_W077, 63, 10, 6
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
delay 15
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
delay 30
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0
delay 20
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
- createsprite gUnknown_83E2990, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2
+ createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1
waitforvisualfinish
end
@@ -909,13 +909,13 @@ gUnknown_81C7BCD:: @ 81C7BCD
Move_LEECH_SEED:: @ 81C7C23
loadspritegfx 10006
playsewithpan SE_W077, 192
- createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32
+ createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32
delay 8
playsewithpan SE_W077, 192
- createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40
+ createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40
delay 8
playsewithpan SE_W077, 192
- createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37
+ createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37
delay 12
loopsewithpan SE_W039, 63, 10, 8
waitforvisualfinish
@@ -5540,33 +5540,33 @@ gUnknown_81CE521:: @ 81CE521
goto gUnknown_81CE51F
gUnknown_81CE54B:: @ 81CE54B
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 40, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -40, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 0, 40, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 40, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 0, -40, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -40, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, -20, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -20, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 20, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 20, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -20, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, 20, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -20, 30, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, 30, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 20, -30, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, -30, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -20, -30, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, -30, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 20, 30, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, 30, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, 0, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 0, 16
delay 2
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 0, 16
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 0, 16
delay 2
return
@@ -5574,21 +5574,21 @@ gUnknown_81CE61E:: @ 81CE61E
call gUnknown_81D5A07
panse_1B SE_W076, 192, 63, 2, 0
createvisualtask sub_80A2500, 5,
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 0
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 1
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
createvisualtask sub_80BA7F8, 10, 4, 1, 0, 10, 1017
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 2
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 3
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 4
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 5
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 6
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
call gUnknown_81CE6F0
call gUnknown_81CE6F0
@@ -5598,19 +5598,19 @@ gUnknown_81CE61E:: @ 81CE61E
goto gUnknown_81CE51F
gUnknown_81CE6F0:: @ 81CE6F0
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 0
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 1
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 2
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 3
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 4
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 5
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
- createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 6
+ createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
return
@@ -5823,28 +5823,28 @@ Move_ABSORB:: @ 81CEBD5
gUnknown_81CEC44:: @ 81CEC44
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W152, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -5876,36 +5876,36 @@ Move_MEGA_DRAIN:: @ 81CECED
gUnknown_81CED5C:: @ 81CED5C
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W145C, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -5937,44 +5937,44 @@ Move_GIGA_DRAIN:: @ 81CEE7D
gUnknown_81CEEEC:: @ 81CEEEC
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -40, 35
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 28, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 40, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -32, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -40, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 36, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W202, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -7139,44 +7139,44 @@ Move_DREAM_EATER:: @ 81D0A1F
gUnknown_81D0A89:: @ 81D0A89
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -40, 35
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 28, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 40, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -32, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -40, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 36, 33
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W207, 63
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26
- createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
+ createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -7693,19 +7693,19 @@ Move_RECOVER:: @ 81D16CD
end
gUnknown_81D170D:: @ 81D170D
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, -10, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -35, -10, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 15, -40, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 15, -40, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -10, -32, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 25, -20, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 25, -20, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -20, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 13
delay 3
- createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 5, -40, 13
+ createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13
delay 3
return
@@ -8296,21 +8296,21 @@ Move_STOCKPILE:: @ 81D256B
end
gUnknown_81D25A9:: @ 81D25A9
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, 55, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, -55, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 0, 55, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 55, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 0, -55, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -55, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, -34, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, -34, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, 34, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 34, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, -34, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -34, 13
delay 1
- createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, 34, 13
+ createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, 34, 13
delay 1
return
@@ -8531,8 +8531,8 @@ Move_HYPER_BEAM:: @ 81D29A7
end
gUnknown_81D2AD8:: @ 81D2AD8
- createsprite gUnknown_83E2B00, ANIM_TARGET, 2,
- createsprite gUnknown_83E2B00, ANIM_TARGET, 2,
+ createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2,
+ createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2,
delay 1
return
diff --git a/data/battle_anim_special.s b/data/battle_anim_special.s
index 967e27674..27d7636f6 100644
--- a/data/battle_anim_special.s
+++ b/data/battle_anim_special.s
@@ -96,22 +96,22 @@ gUnknown_840C074:: @ 840C074
.4byte sub_80F103C
gUnknown_840C0A4:: @ 840C0A4
- spr_template 55020, 55020, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55020, 55020, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_840C0BC::
- spr_template 55021, 55021, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55022, 55022, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55023, 55023, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55021, 55021, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55022, 55022, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55023, 55023, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_840C104:: @ 840C104
- spr_template 55024, 55024, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55025, 55025, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55026, 55026, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55027, 55027, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55028, 55028, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55029, 55029, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55030, 55030, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55031, 55031, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55024, 55024, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55025, 55025, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55026, 55026, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55027, 55027, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55028, 55028, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55029, 55029, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55030, 55030, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 55031, 55031, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_840C1C4:: @ 840C1C4
.2byte RGB(31, 22, 30)
@@ -134,7 +134,7 @@ gUnknown_840C1DC:: @ 840C1DC
.align 2
gUnknown_840C1EC::
- spr_template 10269, 10269, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
+ spr_template 10269, 10269, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
gUnknown_840C204::
obj_image_anim_frame 0x0040, 1
@@ -144,5 +144,5 @@ gSpriteAnimTable_840C20C::
.4byte gUnknown_840C204
gUnknown_840C210::
- spr_template 10058, 10058, gOamData_83AC9D8, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
+ spr_template 10058, 10058, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
diff --git a/data/battle_anim_status_effects.s b/data/battle_anim_status_effects.s
index 6e8952131..f2fff9a3f 100644
--- a/data/battle_anim_status_effects.s
+++ b/data/battle_anim_status_effects.s
@@ -14,10 +14,10 @@ gSpriteAnimTable_83BF3F4:: @ 83BF3F4
.4byte gUnknown_83BF3E0
gSpriteTemplate_83BF3F8:: @ 83BF3F8
- spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58
+ spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gSpriteTemplate_83BF410:: @ 83BF410
- spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8
+ spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8
gUnknown_83BF428:: @ 83BF428
obj_image_anim_frame 0x0000, 3
@@ -27,10 +27,10 @@ gSpriteAnimTable_83BF430:: @ 83BF430
.4byte gUnknown_83BF428
gSpriteTemplate_83BF434:: @ 83BF434
- spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C
+ spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C
gSpriteTemplate_83BF44C:: @ 83BF44C
- spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350
+ spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350
gUnknown_83BF464:: @ 83BF464
obj_image_anim_frame 0x0000, 3
@@ -44,10 +44,10 @@ gSpriteAnimTable_83BF47C:: @ 83BF47C
.4byte gUnknown_83BF464
gSpriteTemplate_83BF480:: @ 83BF480
- spr_template 10071, 10071, gOamData_83AC9D8, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0
+ spr_template 10071, 10071, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0
gSpriteTemplate_83BF498:: @ 83BF498
- spr_template 10051, 10051, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58
+ spr_template 10051, 10051, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gUnknown_83BF4B0:: @ 83BF4B0
obj_image_anim_frame 0x0000, 5
@@ -67,7 +67,7 @@ gSpriteAniimTable_83BF4C8:: @ 83BF4C8
.4byte gUnknown_83BF4C0
gSpriteTemplate_83BF4D4:: @ 83BF4D4
- spr_template 10135, 10135, gOamData_83AC9D8, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58
+ spr_template 10135, 10135, gOamData_AffineOff_ObjNormal_32x32, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gUnknown_83BF4EC:: @ 83BF4EC
obj_image_anim_frame 0x0000, 15
@@ -85,7 +85,7 @@ gSpriteAffineAnimTable_83BF510:: @ 83BF510
.4byte gUnknown_83BF4F8
gSpriteTemplate_83BF514:: @ 83BF514
- spr_template 10004, 10004, gOamData_83ACA90, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8
+ spr_template 10004, 10004, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8
gUnknown_83BF52C:: @ 83BF52C
.string "TASK OVER\n"
@@ -104,7 +104,7 @@ gUnknown_83BF554:: @ 83BF554
.4byte gSubsprites_83BF544
gUnknown_83BF55C:: @ 83BF55C
- spr_template 10010, 10010, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 10010, 10010, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83BF574:: @ 83BF574
- spr_template 10136, 10136, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C
+ spr_template 10136, 10136, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C
diff --git a/data/berry_crush.s b/data/berry_crush.s
index 8ca6e6a0c..cc7ae23fd 100644
--- a/data/berry_crush.s
+++ b/data/berry_crush.s
@@ -325,19 +325,19 @@ gUnknown_846F408::
.4byte gUnknown_846F3D4
gUnknown_846F410:: @ 846F410
- spr_template 1, 1, gOamData_83AC9E0, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 1, 1, gOamData_AffineOff_ObjNormal_64x64, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F428:: @ 846F428
- spr_template 2, 2, gOamData_83AC9D8, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0
+ spr_template 2, 2, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0
gUnknown_846F440:: @ 846F440
- spr_template 3, 2, gOamData_83AC9D0, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 3, 2, gOamData_AffineOff_ObjNormal_16x16, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F458:: @ 846F458
- spr_template 4, 4, gOamData_83ACA08, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 4, 4, gOamData_AffineOff_ObjNormal_8x16, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F470:: @ 846F470
- spr_template 5, 5, gOamData_83ACA98, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
+ spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
.byte 9, 2, 8
diff --git a/data/field_weather.s b/data/field_weather.s
index 356ec81a5..890f0fef6 100644
--- a/data/field_weather.s
+++ b/data/field_weather.s
@@ -389,7 +389,7 @@ gUnknown_83C68B8::
.4byte gUnknown_83C68AC
gUnknown_83C68BC:: @ 83C68BC
- spr_template 4613, 4608, gOamData_83AC9C8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4
+ spr_template 4613, 4608, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4
gUnknown_83C68D4:: @ 83C68D4
.2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000
diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s
index 3d01bf64f..8f37f94e0 100644
--- a/data/pokemon_jump.s
+++ b/data/pokemon_jump.s
@@ -51,7 +51,7 @@ gUnknown_846B47C::
.4byte gUnknown_846B474
gUnknown_846B494:: @ 846B494
- spr_template 0x2000, 0x2000, gOamData_83AC9D8, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+ spr_template 0x2000, 0x2000, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846B4AC:: @ 846B4AC
@ This is a 2D array with one row.
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 15:16:41 +0000