diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
index 555ec30f1..834457f36 100644
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@@ -189,1082 +189,1082 @@ BattleAnimFrameData:
assert_table_length NUM_BATTLEANIMFRAMESETS
.Frameset_00:
- frame BATTLEANIMOAMSET_00, 6
- delanim
+ oamframe BATTLEANIMOAMSET_00, 6
+ oamdelete
.Frameset_01:
- frame BATTLEANIMOAMSET_01, 6
- delanim
+ oamframe BATTLEANIMOAMSET_01, 6
+ oamdelete
.Frameset_02:
- frame BATTLEANIMOAMSET_02, 6
- delanim
+ oamframe BATTLEANIMOAMSET_02, 6
+ oamdelete
.Frameset_03:
- frame BATTLEANIMOAMSET_03, 6
- delanim
+ oamframe BATTLEANIMOAMSET_03, 6
+ oamdelete
.Frameset_04:
- frame BATTLEANIMOAMSET_04, 6
- delanim
+ oamframe BATTLEANIMOAMSET_04, 6
+ oamdelete
.Frameset_05:
- frame BATTLEANIMOAMSET_05, 6
- delanim
+ oamframe BATTLEANIMOAMSET_05, 6
+ oamdelete
.Frameset_06:
- frame BATTLEANIMOAMSET_06, 6
- delanim
+ oamframe BATTLEANIMOAMSET_06, 6
+ oamdelete
.Frameset_07:
- frame BATTLEANIMOAMSET_03, 4
- frame BATTLEANIMOAMSET_01, 1
- frame BATTLEANIMOAMSET_03, 4
- frame BATTLEANIMOAMSET_01, 1
- frame BATTLEANIMOAMSET_03, 4
- frame BATTLEANIMOAMSET_01, 1
- frame BATTLEANIMOAMSET_03, 4
- frame BATTLEANIMOAMSET_01, 1
- delanim
+ oamframe BATTLEANIMOAMSET_03, 4
+ oamframe BATTLEANIMOAMSET_01, 1
+ oamframe BATTLEANIMOAMSET_03, 4
+ oamframe BATTLEANIMOAMSET_01, 1
+ oamframe BATTLEANIMOAMSET_03, 4
+ oamframe BATTLEANIMOAMSET_01, 1
+ oamframe BATTLEANIMOAMSET_03, 4
+ oamframe BATTLEANIMOAMSET_01, 1
+ oamdelete
.Frameset_3e:
- frame BATTLEANIMOAMSET_4B, 2
- frame BATTLEANIMOAMSET_4C, 2
- frame BATTLEANIMOAMSET_4D, 4
- frame BATTLEANIMOAMSET_4E, 2
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 2
+ oamframe BATTLEANIMOAMSET_4C, 2
+ oamframe BATTLEANIMOAMSET_4D, 4
+ oamframe BATTLEANIMOAMSET_4E, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2
+ oamdelete
.Frameset_3f:
- frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP
+ oamdelete
.Frameset_40:
- frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_41:
- frame BATTLEANIMOAMSET_4B, 1
- frame BATTLEANIMOAMSET_4C, 1
- frame BATTLEANIMOAMSET_4D, 1
- frame BATTLEANIMOAMSET_4F, 1
- frame BATTLEANIMOAMSET_50, 1
- frame BATTLEANIMOAMSET_51, 1
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 1
+ oamframe BATTLEANIMOAMSET_4C, 1
+ oamframe BATTLEANIMOAMSET_4D, 1
+ oamframe BATTLEANIMOAMSET_4F, 1
+ oamframe BATTLEANIMOAMSET_50, 1
+ oamframe BATTLEANIMOAMSET_51, 1
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamdelete
.Frameset_42:
- frame BATTLEANIMOAMSET_4B, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4C, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4D, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4C, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_50, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_51, 1, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP
+ oamdelete
.Frameset_08:
- frame BATTLEANIMOAMSET_00, 3
- frame BATTLEANIMOAMSET_07, 3
- frame BATTLEANIMOAMSET_08, 3
- frame BATTLEANIMOAMSET_09, 3
- delanim
+ oamframe BATTLEANIMOAMSET_00, 3
+ oamframe BATTLEANIMOAMSET_07, 3
+ oamframe BATTLEANIMOAMSET_08, 3
+ oamframe BATTLEANIMOAMSET_09, 3
+ oamdelete
.Frameset_09:
- frame BATTLEANIMOAMSET_0A, 7
- frame BATTLEANIMOAMSET_0B, 7
- frame BATTLEANIMOAMSET_0A, 7
- frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamframe BATTLEANIMOAMSET_0B, 7
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamframe BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
+ oamrestart
.Frameset_0a:
- frame BATTLEANIMOAMSET_0C, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0C, 8
+ oamend
.Frameset_0b:
- frame BATTLEANIMOAMSET_0D, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0D, 8
+ oamend
.Frameset_0c:
- frame BATTLEANIMOAMSET_0A, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0A, 8
+ oamend
.Frameset_0d:
- frame BATTLEANIMOAMSET_0A, 7
- frame BATTLEANIMOAMSET_0B, 7
- frame BATTLEANIMOAMSET_0A, 7
- frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
- frame BATTLEANIMOAMSET_0A, 7
- endanim
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamframe BATTLEANIMOAMSET_0B, 7
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamframe BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamend
.Frameset_0e:
- frame BATTLEANIMOAMSET_0A, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0A, 8
+ oamend
.Frameset_0f:
- frame BATTLEANIMOAMSET_0A, 4
- frame BATTLEANIMOAMSET_0E, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_0A, 4
+ oamframe BATTLEANIMOAMSET_0E, 4
+ oamrestart
.Frameset_10:
- frame BATTLEANIMOAMSET_0F, 4
- frame BATTLEANIMOAMSET_10, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_0F, 4
+ oamframe BATTLEANIMOAMSET_10, 4
+ oamrestart
.Frameset_11:
- frame BATTLEANIMOAMSET_10, 4
- frame BATTLEANIMOAMSET_0F, 4
- frame BATTLEANIMOAMSET_0E, 4
- frame BATTLEANIMOAMSET_0A, 4
- frame BATTLEANIMOAMSET_0E, 4
- frame BATTLEANIMOAMSET_0A, 4
- frame BATTLEANIMOAMSET_0E, 4
- frame BATTLEANIMOAMSET_0A, 4
- delanim
+ oamframe BATTLEANIMOAMSET_10, 4
+ oamframe BATTLEANIMOAMSET_0F, 4
+ oamframe BATTLEANIMOAMSET_0E, 4
+ oamframe BATTLEANIMOAMSET_0A, 4
+ oamframe BATTLEANIMOAMSET_0E, 4
+ oamframe BATTLEANIMOAMSET_0A, 4
+ oamframe BATTLEANIMOAMSET_0E, 4
+ oamframe BATTLEANIMOAMSET_0A, 4
+ oamdelete
.Frameset_12:
- frame BATTLEANIMOAMSET_10, 1
- frame BATTLEANIMOAMSET_0F, 1
- frame BATTLEANIMOAMSET_12, 1
- frame BATTLEANIMOAMSET_11, 1
- frame BATTLEANIMOAMSET_12, 1
- frame BATTLEANIMOAMSET_0F, 1
- dorestart
+ oamframe BATTLEANIMOAMSET_10, 1
+ oamframe BATTLEANIMOAMSET_0F, 1
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamframe BATTLEANIMOAMSET_11, 1
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamframe BATTLEANIMOAMSET_0F, 1
+ oamrestart
.Frameset_13:
- frame BATTLEANIMOAMSET_10, 3
- frame BATTLEANIMOAMSET_0F, 3
- frame BATTLEANIMOAMSET_12, 1
- dowait 1
- frame BATTLEANIMOAMSET_12, 1
- dowait 1
- frame BATTLEANIMOAMSET_12, 1
- dowait 1
- frame BATTLEANIMOAMSET_12, 1
- dowait 1
- frame BATTLEANIMOAMSET_12, 3
- delanim
+ oamframe BATTLEANIMOAMSET_10, 3
+ oamframe BATTLEANIMOAMSET_0F, 3
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamwait 1
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamwait 1
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamwait 1
+ oamframe BATTLEANIMOAMSET_12, 1
+ oamwait 1
+ oamframe BATTLEANIMOAMSET_12, 3
+ oamdelete
.Frameset_14:
- frame BATTLEANIMOAMSET_13, 20
- delanim
+ oamframe BATTLEANIMOAMSET_13, 20
+ oamdelete
.Frameset_15:
- frame BATTLEANIMOAMSET_10, 1
- frame BATTLEANIMOAMSET_0F, 1
- dorestart
+ oamframe BATTLEANIMOAMSET_10, 1
+ oamframe BATTLEANIMOAMSET_0F, 1
+ oamrestart
.Frameset_16:
- frame BATTLEANIMOAMSET_14, 8
- endanim
+ oamframe BATTLEANIMOAMSET_14, 8
+ oamend
.Frameset_17:
- frame BATTLEANIMOAMSET_17, 4
- frame BATTLEANIMOAMSET_16, 8
- frame BATTLEANIMOAMSET_15, 8
- frame BATTLEANIMOAMSET_16, 8
- frame BATTLEANIMOAMSET_17, 4
- frame BATTLEANIMOAMSET_17, 4
- frame BATTLEANIMOAMSET_16, 8, OAM_X_FLIP
- frame BATTLEANIMOAMSET_15, 8, OAM_X_FLIP
- frame BATTLEANIMOAMSET_16, 8, OAM_X_FLIP
- frame BATTLEANIMOAMSET_17, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_17, 4
+ oamframe BATTLEANIMOAMSET_16, 8
+ oamframe BATTLEANIMOAMSET_15, 8
+ oamframe BATTLEANIMOAMSET_16, 8
+ oamframe BATTLEANIMOAMSET_17, 4
+ oamframe BATTLEANIMOAMSET_17, 4
+ oamframe BATTLEANIMOAMSET_16, 8, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_15, 8, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_16, 8, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_17, 4
+ oamrestart
.Frameset_56:
- frame BATTLEANIMOAMSET_69, 8
- endanim
+ oamframe BATTLEANIMOAMSET_69, 8
+ oamend
.Frameset_57:
- frame BATTLEANIMOAMSET_69, 32
- frame BATTLEANIMOAMSET_6A, 4
- frame BATTLEANIMOAMSET_6B, 4
- frame BATTLEANIMOAMSET_6D, 4
- frame BATTLEANIMOAMSET_6C, 4
- endanim
+ oamframe BATTLEANIMOAMSET_69, 32
+ oamframe BATTLEANIMOAMSET_6A, 4
+ oamframe BATTLEANIMOAMSET_6B, 4
+ oamframe BATTLEANIMOAMSET_6D, 4
+ oamframe BATTLEANIMOAMSET_6C, 4
+ oamend
.Frameset_58:
- frame BATTLEANIMOAMSET_6C, 8
- frame BATTLEANIMOAMSET_6D, 8
- dorestart
+ oamframe BATTLEANIMOAMSET_6C, 8
+ oamframe BATTLEANIMOAMSET_6D, 8
+ oamrestart
.Frameset_18:
- frame BATTLEANIMOAMSET_18, 4
- frame BATTLEANIMOAMSET_19, 4
- frame BATTLEANIMOAMSET_1A, 4
- delanim
+ oamframe BATTLEANIMOAMSET_18, 4
+ oamframe BATTLEANIMOAMSET_19, 4
+ oamframe BATTLEANIMOAMSET_1A, 4
+ oamdelete
.Frameset_19:
- frame BATTLEANIMOAMSET_1B, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1B, 8
+ oamend
.Frameset_1a:
- frame BATTLEANIMOAMSET_0F, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0F, 8
+ oamend
.Frameset_1b:
- frame BATTLEANIMOAMSET_1C, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1C, 8
+ oamend
.Frameset_1c:
- frame BATTLEANIMOAMSET_0A, 8
- delanim
+ oamframe BATTLEANIMOAMSET_0A, 8
+ oamdelete
.Frameset_1d:
- frame BATTLEANIMOAMSET_1D, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1D, 8
+ oamend
.Frameset_1e:
- frame BATTLEANIMOAMSET_17, 8
- endanim
+ oamframe BATTLEANIMOAMSET_17, 8
+ oamend
.Frameset_1f:
- frame BATTLEANIMOAMSET_0F, 3
- frame BATTLEANIMOAMSET_10, 3
- frame BATTLEANIMOAMSET_1E, 3
- endanim
+ oamframe BATTLEANIMOAMSET_0F, 3
+ oamframe BATTLEANIMOAMSET_10, 3
+ oamframe BATTLEANIMOAMSET_1E, 3
+ oamend
.Frameset_20:
- frame BATTLEANIMOAMSET_1F, 16
- frame BATTLEANIMOAMSET_20, 3
- delanim
+ oamframe BATTLEANIMOAMSET_1F, 16
+ oamframe BATTLEANIMOAMSET_20, 3
+ oamdelete
.Frameset_21:
- frame BATTLEANIMOAMSET_20, 8
- endanim
+ oamframe BATTLEANIMOAMSET_20, 8
+ oamend
.Frameset_22:
- frame BATTLEANIMOAMSET_20, 8
- frame BATTLEANIMOAMSET_21, 8
- frame BATTLEANIMOAMSET_1B, 8
- frame BATTLEANIMOAMSET_21, 8
- dorestart
+ oamframe BATTLEANIMOAMSET_20, 8
+ oamframe BATTLEANIMOAMSET_21, 8
+ oamframe BATTLEANIMOAMSET_1B, 8
+ oamframe BATTLEANIMOAMSET_21, 8
+ oamrestart
.Frameset_23:
- frame BATTLEANIMOAMSET_22, 8
- endanim
+ oamframe BATTLEANIMOAMSET_22, 8
+ oamend
.Frameset_24:
- frame BATTLEANIMOAMSET_1B, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1B, 8
+ oamend
.Frameset_25:
- frame BATTLEANIMOAMSET_23, 8
- endanim
+ oamframe BATTLEANIMOAMSET_23, 8
+ oamend
.Frameset_26:
- frame BATTLEANIMOAMSET_24, 8
- endanim
+ oamframe BATTLEANIMOAMSET_24, 8
+ oamend
.Frameset_27:
- frame BATTLEANIMOAMSET_25, 8
- endanim
+ oamframe BATTLEANIMOAMSET_25, 8
+ oamend
.Frameset_28:
- frame BATTLEANIMOAMSET_26, 8
- frame BATTLEANIMOAMSET_27, 8
- endanim
+ oamframe BATTLEANIMOAMSET_26, 8
+ oamframe BATTLEANIMOAMSET_27, 8
+ oamend
.Frameset_29:
- frame BATTLEANIMOAMSET_28, 8
- frame BATTLEANIMOAMSET_29, 8
- delanim
+ oamframe BATTLEANIMOAMSET_28, 8
+ oamframe BATTLEANIMOAMSET_29, 8
+ oamdelete
.Frameset_2a:
- frame BATTLEANIMOAMSET_2A, 1
- frame BATTLEANIMOAMSET_2B, 1
- frame BATTLEANIMOAMSET_2C, 1
- frame BATTLEANIMOAMSET_2D, 1
- frame BATTLEANIMOAMSET_2E, 1
- frame BATTLEANIMOAMSET_2D, 1
- frame BATTLEANIMOAMSET_2C, 1
- frame BATTLEANIMOAMSET_2B, 1
- frame BATTLEANIMOAMSET_2A, 1
- delanim
+ oamframe BATTLEANIMOAMSET_2A, 1
+ oamframe BATTLEANIMOAMSET_2B, 1
+ oamframe BATTLEANIMOAMSET_2C, 1
+ oamframe BATTLEANIMOAMSET_2D, 1
+ oamframe BATTLEANIMOAMSET_2E, 1
+ oamframe BATTLEANIMOAMSET_2D, 1
+ oamframe BATTLEANIMOAMSET_2C, 1
+ oamframe BATTLEANIMOAMSET_2B, 1
+ oamframe BATTLEANIMOAMSET_2A, 1
+ oamdelete
.Frameset_2b:
- frame BATTLEANIMOAMSET_14, 1
- frame BATTLEANIMOAMSET_15, 1
- dorestart
+ oamframe BATTLEANIMOAMSET_14, 1
+ oamframe BATTLEANIMOAMSET_15, 1
+ oamrestart
.Frameset_2c:
- frame BATTLEANIMOAMSET_2F, 4
- frame BATTLEANIMOAMSET_30, 40
- delanim
+ oamframe BATTLEANIMOAMSET_2F, 4
+ oamframe BATTLEANIMOAMSET_30, 40
+ oamdelete
.Frameset_2d:
- frame BATTLEANIMOAMSET_31, 8
- endanim
+ oamframe BATTLEANIMOAMSET_31, 8
+ oamend
.Frameset_2e:
- frame BATTLEANIMOAMSET_32, 32
- frame BATTLEANIMOAMSET_33, 32
- frame BATTLEANIMOAMSET_34, 32
- frame BATTLEANIMOAMSET_35, 32 ; fallthrough
+ oamframe BATTLEANIMOAMSET_32, 32
+ oamframe BATTLEANIMOAMSET_33, 32
+ oamframe BATTLEANIMOAMSET_34, 32
+ oamframe BATTLEANIMOAMSET_35, 32 ; fallthrough
.Frameset_2f:
- dowait 2
- frame BATTLEANIMOAMSET_35, 4
- dowait 2
- frame BATTLEANIMOAMSET_35, 4
- dowait 2
- frame BATTLEANIMOAMSET_35, 4
- dowait 2
- frame BATTLEANIMOAMSET_35, 4
- delanim
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_35, 4
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_35, 4
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_35, 4
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_35, 4
+ oamdelete
.Frameset_30:
- frame BATTLEANIMOAMSET_14, 4
- frame BATTLEANIMOAMSET_15, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_14, 4
+ oamframe BATTLEANIMOAMSET_15, 4
+ oamrestart
.Frameset_31:
- frame BATTLEANIMOAMSET_36, 2
- frame BATTLEANIMOAMSET_37, 2
- frame BATTLEANIMOAMSET_38, 2
- frame BATTLEANIMOAMSET_39, 32
- delanim
+ oamframe BATTLEANIMOAMSET_36, 2
+ oamframe BATTLEANIMOAMSET_37, 2
+ oamframe BATTLEANIMOAMSET_38, 2
+ oamframe BATTLEANIMOAMSET_39, 32
+ oamdelete
.Frameset_32:
- frame BATTLEANIMOAMSET_3A, 2
- frame BATTLEANIMOAMSET_3B, 2
- frame BATTLEANIMOAMSET_3C, 2
- frame BATTLEANIMOAMSET_3D, 32
- delanim
+ oamframe BATTLEANIMOAMSET_3A, 2
+ oamframe BATTLEANIMOAMSET_3B, 2
+ oamframe BATTLEANIMOAMSET_3C, 2
+ oamframe BATTLEANIMOAMSET_3D, 32
+ oamdelete
.Frameset_33:
- frame BATTLEANIMOAMSET_3A, 2, OAM_X_FLIP
- frame BATTLEANIMOAMSET_3B, 2, OAM_X_FLIP
- frame BATTLEANIMOAMSET_3C, 2, OAM_X_FLIP
- frame BATTLEANIMOAMSET_3D, 32, OAM_X_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_3A, 2, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_3B, 2, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_3C, 2, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_3D, 32, OAM_X_FLIP
+ oamdelete
.Frameset_34:
- frame BATTLEANIMOAMSET_3E, 8
- frame BATTLEANIMOAMSET_3F, 8
- frame BATTLEANIMOAMSET_40, 8
- endanim
+ oamframe BATTLEANIMOAMSET_3E, 8
+ oamframe BATTLEANIMOAMSET_3F, 8
+ oamframe BATTLEANIMOAMSET_40, 8
+ oamend
.Frameset_35:
- frame BATTLEANIMOAMSET_40, 2
- dowait 2
- frame BATTLEANIMOAMSET_40, 2
- dowait 2
- frame BATTLEANIMOAMSET_41, 2
- dowait 2
- frame BATTLEANIMOAMSET_41, 2
- dowait 2
- dorestart
+ oamframe BATTLEANIMOAMSET_40, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_40, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_41, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_41, 2
+ oamwait 2
+ oamrestart
.Frameset_36:
- frame BATTLEANIMOAMSET_42, 2
- frame BATTLEANIMOAMSET_43, 2
- frame BATTLEANIMOAMSET_44, 2
- frame BATTLEANIMOAMSET_45, 2
- dorestart
+ oamframe BATTLEANIMOAMSET_42, 2
+ oamframe BATTLEANIMOAMSET_43, 2
+ oamframe BATTLEANIMOAMSET_44, 2
+ oamframe BATTLEANIMOAMSET_45, 2
+ oamrestart
.Frameset_37:
- frame BATTLEANIMOAMSET_19, 2
- dowait 2
- dorestart
+ oamframe BATTLEANIMOAMSET_19, 2
+ oamwait 2
+ oamrestart
.Frameset_38:
- frame BATTLEANIMOAMSET_46, 4
- frame BATTLEANIMOAMSET_47, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_46, 4
+ oamframe BATTLEANIMOAMSET_47, 4
+ oamrestart
.Frameset_39:
- frame BATTLEANIMOAMSET_18, 2
- dowait 2
- dorestart
+ oamframe BATTLEANIMOAMSET_18, 2
+ oamwait 2
+ oamrestart
.Frameset_3a:
- frame BATTLEANIMOAMSET_48, 8
- endanim
+ oamframe BATTLEANIMOAMSET_48, 8
+ oamend
.Frameset_3b:
- frame BATTLEANIMOAMSET_48, 8, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_48, 8, OAM_X_FLIP
+ oamend
.Frameset_3c:
- frame BATTLEANIMOAMSET_49, 8
- endanim
+ oamframe BATTLEANIMOAMSET_49, 8
+ oamend
.Frameset_3d:
- frame BATTLEANIMOAMSET_4A, 8
- endanim
+ oamframe BATTLEANIMOAMSET_4A, 8
+ oamend
.Frameset_43:
- frame BATTLEANIMOAMSET_20, 16
- frame BATTLEANIMOAMSET_1F, 16
- frame BATTLEANIMOAMSET_1E, 16
- endanim
+ oamframe BATTLEANIMOAMSET_20, 16
+ oamframe BATTLEANIMOAMSET_1F, 16
+ oamframe BATTLEANIMOAMSET_1E, 16
+ oamend
.Frameset_4c:
- frame BATTLEANIMOAMSET_20, 8
- frame BATTLEANIMOAMSET_1F, 8
- frame BATTLEANIMOAMSET_1E, 8
- endanim
+ oamframe BATTLEANIMOAMSET_20, 8
+ oamframe BATTLEANIMOAMSET_1F, 8
+ oamframe BATTLEANIMOAMSET_1E, 8
+ oamend
.Frameset_44:
- dowait 20
- frame BATTLEANIMOAMSET_55, 40
- frame BATTLEANIMOAMSET_54, 40
- frame BATTLEANIMOAMSET_53, 20
- dowait 4
- frame BATTLEANIMOAMSET_53, 4
- dowait 4
- frame BATTLEANIMOAMSET_53, 4
- dowait 4
- frame BATTLEANIMOAMSET_53, 4
- delanim
+ oamwait 20
+ oamframe BATTLEANIMOAMSET_55, 40
+ oamframe BATTLEANIMOAMSET_54, 40
+ oamframe BATTLEANIMOAMSET_53, 20
+ oamwait 4
+ oamframe BATTLEANIMOAMSET_53, 4
+ oamwait 4
+ oamframe BATTLEANIMOAMSET_53, 4
+ oamwait 4
+ oamframe BATTLEANIMOAMSET_53, 4
+ oamdelete
.Frameset_7e:
- frame BATTLEANIMOAMSET_1E, 8
- frame BATTLEANIMOAMSET_1F, 8
- frame BATTLEANIMOAMSET_20, 8
- delanim
+ oamframe BATTLEANIMOAMSET_1E, 8
+ oamframe BATTLEANIMOAMSET_1F, 8
+ oamframe BATTLEANIMOAMSET_20, 8
+ oamdelete
.Frameset_45:
- dowait 0
- frame BATTLEANIMOAMSET_14, 0
- frame BATTLEANIMOAMSET_15, 0
- frame BATTLEANIMOAMSET_14, 0, OAM_X_FLIP
- dowait 0
- frame BATTLEANIMOAMSET_16, 0, OAM_X_FLIP
- frame BATTLEANIMOAMSET_15, 0
- frame BATTLEANIMOAMSET_16, 0
- dorestart
+ oamwait 0
+ oamframe BATTLEANIMOAMSET_14, 0
+ oamframe BATTLEANIMOAMSET_15, 0
+ oamframe BATTLEANIMOAMSET_14, 0, OAM_X_FLIP
+ oamwait 0
+ oamframe BATTLEANIMOAMSET_16, 0, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_15, 0
+ oamframe BATTLEANIMOAMSET_16, 0
+ oamrestart
.Frameset_46:
- frame BATTLEANIMOAMSET_56, 2
- frame BATTLEANIMOAMSET_57, 4
- delanim
+ oamframe BATTLEANIMOAMSET_56, 2
+ oamframe BATTLEANIMOAMSET_57, 4
+ oamdelete
.Frameset_47:
- frame BATTLEANIMOAMSET_56, 2, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_57, 4, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_56, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_57, 4, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_48:
- frame BATTLEANIMOAMSET_56, 1
- frame BATTLEANIMOAMSET_57, 1
- frame BATTLEANIMOAMSET_58, 1
- frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_57, 2
- delanim
+ oamframe BATTLEANIMOAMSET_56, 1
+ oamframe BATTLEANIMOAMSET_57, 1
+ oamframe BATTLEANIMOAMSET_58, 1
+ oamframe BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_57, 2
+ oamdelete
.Frameset_49:
- frame BATTLEANIMOAMSET_56, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_57, 1
- frame BATTLEANIMOAMSET_58, 1
- frame BATTLEANIMOAMSET_57, 2, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_56, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_57, 1
+ oamframe BATTLEANIMOAMSET_58, 1
+ oamframe BATTLEANIMOAMSET_57, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_4a:
- frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_57, 1
- frame BATTLEANIMOAMSET_58, 1
- dorestart
+ oamframe BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_57, 1
+ oamframe BATTLEANIMOAMSET_58, 1
+ oamrestart
.Frameset_4b:
- frame BATTLEANIMOAMSET_59, 1
- frame BATTLEANIMOAMSET_5A, 1
- frame BATTLEANIMOAMSET_5B, 1
- frame BATTLEANIMOAMSET_5C, 2
- delanim
+ oamframe BATTLEANIMOAMSET_59, 1
+ oamframe BATTLEANIMOAMSET_5A, 1
+ oamframe BATTLEANIMOAMSET_5B, 1
+ oamframe BATTLEANIMOAMSET_5C, 2
+ oamdelete
.Frameset_4d:
- frame BATTLEANIMOAMSET_0A, 10
- frame BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP
- frame BATTLEANIMOAMSET_5D, 3, OAM_X_FLIP
- frame BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_0A, 2, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_0B, 1, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_5D, 1
- frame BATTLEANIMOAMSET_0B, 1
- dorestart
+ oamframe BATTLEANIMOAMSET_0A, 10
+ oamframe BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_5D, 3, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_0A, 2, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_0B, 1, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_5D, 1
+ oamframe BATTLEANIMOAMSET_0B, 1
+ oamrestart
.Frameset_4e:
- frame BATTLEANIMOAMSET_0A, 3
- frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
- frame BATTLEANIMOAMSET_0A, 7
- frame BATTLEANIMOAMSET_0B, 7
- frame BATTLEANIMOAMSET_0A, 3
- dorestart
+ oamframe BATTLEANIMOAMSET_0A, 3
+ oamframe BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_0A, 7
+ oamframe BATTLEANIMOAMSET_0B, 7
+ oamframe BATTLEANIMOAMSET_0A, 3
+ oamrestart
.Frameset_4f:
- frame BATTLEANIMOAMSET_5E, 32
- frame BATTLEANIMOAMSET_5E, 32
- delanim
+ oamframe BATTLEANIMOAMSET_5E, 32
+ oamframe BATTLEANIMOAMSET_5E, 32
+ oamdelete
.Frameset_50:
- frame BATTLEANIMOAMSET_5F, 32
- frame BATTLEANIMOAMSET_5F, 32
- delanim
+ oamframe BATTLEANIMOAMSET_5F, 32
+ oamframe BATTLEANIMOAMSET_5F, 32
+ oamdelete
.Frameset_51:
- frame BATTLEANIMOAMSET_60, 8
- endanim
+ oamframe BATTLEANIMOAMSET_60, 8
+ oamend
.Frameset_52:
- frame BATTLEANIMOAMSET_61, 1
- frame BATTLEANIMOAMSET_62, 1
- frame BATTLEANIMOAMSET_63, 1
- endanim
+ oamframe BATTLEANIMOAMSET_61, 1
+ oamframe BATTLEANIMOAMSET_62, 1
+ oamframe BATTLEANIMOAMSET_63, 1
+ oamend
.Frameset_53:
- frame BATTLEANIMOAMSET_63, 7
- frame BATTLEANIMOAMSET_64, 7
- dorestart
+ oamframe BATTLEANIMOAMSET_63, 7
+ oamframe BATTLEANIMOAMSET_64, 7
+ oamrestart
.Frameset_54:
- frame BATTLEANIMOAMSET_65, 1
- frame BATTLEANIMOAMSET_66, 1
- frame BATTLEANIMOAMSET_67, 1
- endanim
+ oamframe BATTLEANIMOAMSET_65, 1
+ oamframe BATTLEANIMOAMSET_66, 1
+ oamframe BATTLEANIMOAMSET_67, 1
+ oamend
.Frameset_55:
- frame BATTLEANIMOAMSET_67, 7
- frame BATTLEANIMOAMSET_68, 7
- dorestart
+ oamframe BATTLEANIMOAMSET_67, 7
+ oamframe BATTLEANIMOAMSET_68, 7
+ oamrestart
.Frameset_59:
- frame BATTLEANIMOAMSET_6E, 8
- endanim
+ oamframe BATTLEANIMOAMSET_6E, 8
+ oamend
.Frameset_5a:
- frame BATTLEANIMOAMSET_6F, 8
- endanim
+ oamframe BATTLEANIMOAMSET_6F, 8
+ oamend
.Frameset_5b:
- frame BATTLEANIMOAMSET_6E, 8, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_6E, 8, OAM_Y_FLIP
+ oamend
.Frameset_5c:
- frame BATTLEANIMOAMSET_18, 4
- frame BATTLEANIMOAMSET_70, 4
- frame BATTLEANIMOAMSET_71, 4
- frame BATTLEANIMOAMSET_72, 4
- frame BATTLEANIMOAMSET_73, 4
- delanim
+ oamframe BATTLEANIMOAMSET_18, 4
+ oamframe BATTLEANIMOAMSET_70, 4
+ oamframe BATTLEANIMOAMSET_71, 4
+ oamframe BATTLEANIMOAMSET_72, 4
+ oamframe BATTLEANIMOAMSET_73, 4
+ oamdelete
.Frameset_5d:
- frame BATTLEANIMOAMSET_74, 4
- frame BATTLEANIMOAMSET_75, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_74, 4
+ oamframe BATTLEANIMOAMSET_75, 4
+ oamrestart
.Frameset_5e:
- frame BATTLEANIMOAMSET_14, 8
- endanim
+ oamframe BATTLEANIMOAMSET_14, 8
+ oamend
.Frameset_7a:
- frame BATTLEANIMOAMSET_74, 3
- frame BATTLEANIMOAMSET_14, 3
- frame BATTLEANIMOAMSET_15, 3
- frame BATTLEANIMOAMSET_14, 3
- frame BATTLEANIMOAMSET_15, 3
- delanim
+ oamframe BATTLEANIMOAMSET_74, 3
+ oamframe BATTLEANIMOAMSET_14, 3
+ oamframe BATTLEANIMOAMSET_15, 3
+ oamframe BATTLEANIMOAMSET_14, 3
+ oamframe BATTLEANIMOAMSET_15, 3
+ oamdelete
.Frameset_af:
- frame BATTLEANIMOAMSET_14, 0
- frame BATTLEANIMOAMSET_15, 0
- frame BATTLEANIMOAMSET_14, 0
- frame BATTLEANIMOAMSET_15, 0
- frame BATTLEANIMOAMSET_74, 12
- delanim
+ oamframe BATTLEANIMOAMSET_14, 0
+ oamframe BATTLEANIMOAMSET_15, 0
+ oamframe BATTLEANIMOAMSET_14, 0
+ oamframe BATTLEANIMOAMSET_15, 0
+ oamframe BATTLEANIMOAMSET_74, 12
+ oamdelete
.Frameset_5f:
- frame BATTLEANIMOAMSET_76, 8
- endanim
+ oamframe BATTLEANIMOAMSET_76, 8
+ oamend
.Frameset_60:
- frame BATTLEANIMOAMSET_77, 1
- frame BATTLEANIMOAMSET_78, 1
- frame BATTLEANIMOAMSET_79, 1
- frame BATTLEANIMOAMSET_7A, 1
- frame BATTLEANIMOAMSET_7B, 1
- frame BATTLEANIMOAMSET_7C, 1
- frame BATTLEANIMOAMSET_7D, 1
- frame BATTLEANIMOAMSET_7C, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_7B, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_7A, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_79, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_78, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_77, 1, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_77, 1
+ oamframe BATTLEANIMOAMSET_78, 1
+ oamframe BATTLEANIMOAMSET_79, 1
+ oamframe BATTLEANIMOAMSET_7A, 1
+ oamframe BATTLEANIMOAMSET_7B, 1
+ oamframe BATTLEANIMOAMSET_7C, 1
+ oamframe BATTLEANIMOAMSET_7D, 1
+ oamframe BATTLEANIMOAMSET_7C, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_7B, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_7A, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_79, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_78, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_77, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_61:
- frame BATTLEANIMOAMSET_1B, 4
- frame BATTLEANIMOAMSET_7E, 4
- dorestart
+ oamframe BATTLEANIMOAMSET_1B, 4
+ oamframe BATTLEANIMOAMSET_7E, 4
+ oamrestart
.Frameset_62:
- frame BATTLEANIMOAMSET_1B, 4, OAM_X_FLIP
- frame BATTLEANIMOAMSET_7E, 4, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_1B, 4, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_7E, 4, OAM_X_FLIP
+ oamrestart
.Frameset_63:
- frame BATTLEANIMOAMSET_7F, 8
- endanim
+ oamframe BATTLEANIMOAMSET_7F, 8
+ oamend
.Frameset_64:
- frame BATTLEANIMOAMSET_25, 8
- endanim
+ oamframe BATTLEANIMOAMSET_25, 8
+ oamend
.Frameset_65:
- frame BATTLEANIMOAMSET_80, 8
- endanim
+ oamframe BATTLEANIMOAMSET_80, 8
+ oamend
.Frameset_66:
- frame BATTLEANIMOAMSET_83, 7
- frame BATTLEANIMOAMSET_82, 7
- frame BATTLEANIMOAMSET_81, 7
- frame BATTLEANIMOAMSET_82, 7
- frame BATTLEANIMOAMSET_83, 7
- frame BATTLEANIMOAMSET_82, 7
- frame BATTLEANIMOAMSET_81, 7
- delanim
+ oamframe BATTLEANIMOAMSET_83, 7
+ oamframe BATTLEANIMOAMSET_82, 7
+ oamframe BATTLEANIMOAMSET_81, 7
+ oamframe BATTLEANIMOAMSET_82, 7
+ oamframe BATTLEANIMOAMSET_83, 7
+ oamframe BATTLEANIMOAMSET_82, 7
+ oamframe BATTLEANIMOAMSET_81, 7
+ oamdelete
.Frameset_67:
- frame BATTLEANIMOAMSET_1B, 16
- delanim
+ oamframe BATTLEANIMOAMSET_1B, 16
+ oamdelete
.Frameset_68:
- dowait 15
- frame BATTLEANIMOAMSET_84, 15
- frame BATTLEANIMOAMSET_85, 15
- frame BATTLEANIMOAMSET_29, 15
- frame BATTLEANIMOAMSET_28, 15
- frame BATTLEANIMOAMSET_86, 32
- delanim
+ oamwait 15
+ oamframe BATTLEANIMOAMSET_84, 15
+ oamframe BATTLEANIMOAMSET_85, 15
+ oamframe BATTLEANIMOAMSET_29, 15
+ oamframe BATTLEANIMOAMSET_28, 15
+ oamframe BATTLEANIMOAMSET_86, 32
+ oamdelete
.Frameset_69:
- frame BATTLEANIMOAMSET_1B, 3
- frame BATTLEANIMOAMSET_87, 3
- frame BATTLEANIMOAMSET_88, 3
- frame BATTLEANIMOAMSET_89, 3
- delanim
+ oamframe BATTLEANIMOAMSET_1B, 3
+ oamframe BATTLEANIMOAMSET_87, 3
+ oamframe BATTLEANIMOAMSET_88, 3
+ oamframe BATTLEANIMOAMSET_89, 3
+ oamdelete
.Frameset_6a:
- frame BATTLEANIMOAMSET_8A, 2
- frame BATTLEANIMOAMSET_8B, 2
- frame BATTLEANIMOAMSET_8C, 2
- frame BATTLEANIMOAMSET_8D, 2
- delanim
+ oamframe BATTLEANIMOAMSET_8A, 2
+ oamframe BATTLEANIMOAMSET_8B, 2
+ oamframe BATTLEANIMOAMSET_8C, 2
+ oamframe BATTLEANIMOAMSET_8D, 2
+ oamdelete
.Frameset_6b:
- frame BATTLEANIMOAMSET_61, 2
- frame BATTLEANIMOAMSET_62, 2
- frame BATTLEANIMOAMSET_63, 2
- endanim
+ oamframe BATTLEANIMOAMSET_61, 2
+ oamframe BATTLEANIMOAMSET_62, 2
+ oamframe BATTLEANIMOAMSET_63, 2
+ oamend
.Frameset_6c:
- frame BATTLEANIMOAMSET_65, 2
- frame BATTLEANIMOAMSET_66, 2
- frame BATTLEANIMOAMSET_67, 2
- endanim
+ oamframe BATTLEANIMOAMSET_65, 2
+ oamframe BATTLEANIMOAMSET_66, 2
+ oamframe BATTLEANIMOAMSET_67, 2
+ oamend
.Frameset_6d:
- frame BATTLEANIMOAMSET_8E, 8
- endanim
+ oamframe BATTLEANIMOAMSET_8E, 8
+ oamend
.Frameset_6e:
- frame BATTLEANIMOAMSET_8E, 8, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_8E, 8, OAM_X_FLIP
+ oamend
.Frameset_6f:
- frame BATTLEANIMOAMSET_8F, 16
- frame BATTLEANIMOAMSET_90, 16
- dorestart
+ oamframe BATTLEANIMOAMSET_8F, 16
+ oamframe BATTLEANIMOAMSET_90, 16
+ oamrestart
.Frameset_70:
- frame BATTLEANIMOAMSET_91, 16
- frame BATTLEANIMOAMSET_92, 16
- dorestart
+ oamframe BATTLEANIMOAMSET_91, 16
+ oamframe BATTLEANIMOAMSET_92, 16
+ oamrestart
.Frameset_71:
- frame BATTLEANIMOAMSET_93, 8
- endanim
+ oamframe BATTLEANIMOAMSET_93, 8
+ oamend
.Frameset_72:
- frame BATTLEANIMOAMSET_1E, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1E, 8
+ oamend
.Frameset_73:
- frame BATTLEANIMOAMSET_1B, 7
- frame BATTLEANIMOAMSET_94, 7
- dorestart
+ oamframe BATTLEANIMOAMSET_1B, 7
+ oamframe BATTLEANIMOAMSET_94, 7
+ oamrestart
.Frameset_74:
- frame BATTLEANIMOAMSET_95, 8
- endanim
+ oamframe BATTLEANIMOAMSET_95, 8
+ oamend
.Frameset_75:
- frame BATTLEANIMOAMSET_96, 8
- endanim
+ oamframe BATTLEANIMOAMSET_96, 8
+ oamend
.Frameset_76:
- frame BATTLEANIMOAMSET_95, 8
- endanim
+ oamframe BATTLEANIMOAMSET_95, 8
+ oamend
.Frameset_77:
- frame BATTLEANIMOAMSET_97, 1
- frame BATTLEANIMOAMSET_97, 1, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_97, 1
+ oamframe BATTLEANIMOAMSET_97, 1, OAM_X_FLIP
+ oamrestart
.Frameset_78:
- frame BATTLEANIMOAMSET_98, 8
- endanim
+ oamframe BATTLEANIMOAMSET_98, 8
+ oamend
.Frameset_79:
- frame BATTLEANIMOAMSET_99, 32
- frame BATTLEANIMOAMSET_99, 32
- frame BATTLEANIMOAMSET_99, 32
- frame BATTLEANIMOAMSET_99, 32
- frame BATTLEANIMOAMSET_99, 32
- frame BATTLEANIMOAMSET_9A, 8
- endanim
+ oamframe BATTLEANIMOAMSET_99, 32
+ oamframe BATTLEANIMOAMSET_99, 32
+ oamframe BATTLEANIMOAMSET_99, 32
+ oamframe BATTLEANIMOAMSET_99, 32
+ oamframe BATTLEANIMOAMSET_99, 32
+ oamframe BATTLEANIMOAMSET_9A, 8
+ oamend
.Frameset_7b:
- frame BATTLEANIMOAMSET_9B, 8
- endanim
+ oamframe BATTLEANIMOAMSET_9B, 8
+ oamend
.Frameset_7c:
- frame BATTLEANIMOAMSET_9C, 2
- frame BATTLEANIMOAMSET_9D, 2
- frame BATTLEANIMOAMSET_9E, 8
- dowait 2
- frame BATTLEANIMOAMSET_9E, 2
- dowait 2
- frame BATTLEANIMOAMSET_9E, 2
- dowait 2
- frame BATTLEANIMOAMSET_9E, 2
- delanim
+ oamframe BATTLEANIMOAMSET_9C, 2
+ oamframe BATTLEANIMOAMSET_9D, 2
+ oamframe BATTLEANIMOAMSET_9E, 8
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_9E, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_9E, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_9E, 2
+ oamdelete
.Frameset_7d:
- frame BATTLEANIMOAMSET_9F, 8
- endanim
+ oamframe BATTLEANIMOAMSET_9F, 8
+ oamend
.Frameset_7f:
- frame BATTLEANIMOAMSET_0F, 8
- endanim
+ oamframe BATTLEANIMOAMSET_0F, 8
+ oamend
.Frameset_80:
- frame BATTLEANIMOAMSET_6B, 24
- delanim
+ oamframe BATTLEANIMOAMSET_6B, 24
+ oamdelete
.Frameset_81:
- frame BATTLEANIMOAMSET_A0, 1 ; fallthrough
+ oamframe BATTLEANIMOAMSET_A0, 1 ; fallthrough
.Frameset_82:
- frame BATTLEANIMOAMSET_A1, 1 ; fallthrough
+ oamframe BATTLEANIMOAMSET_A1, 1 ; fallthrough
.Frameset_83:
- frame BATTLEANIMOAMSET_A2, 1
- delanim
+ oamframe BATTLEANIMOAMSET_A2, 1
+ oamdelete
.Frameset_84:
- frame BATTLEANIMOAMSET_A3, 8
- endanim
+ oamframe BATTLEANIMOAMSET_A3, 8
+ oamend
.Frameset_85:
- frame BATTLEANIMOAMSET_A4, 4
- frame BATTLEANIMOAMSET_A5, 4
- frame BATTLEANIMOAMSET_A6, 4
- frame BATTLEANIMOAMSET_A7, 4
- frame BATTLEANIMOAMSET_A6, 4, OAM_X_FLIP
- frame BATTLEANIMOAMSET_A5, 4, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_A4, 4
+ oamframe BATTLEANIMOAMSET_A5, 4
+ oamframe BATTLEANIMOAMSET_A6, 4
+ oamframe BATTLEANIMOAMSET_A7, 4
+ oamframe BATTLEANIMOAMSET_A6, 4, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_A5, 4, OAM_X_FLIP
+ oamrestart
.Frameset_86:
- frame BATTLEANIMOAMSET_A8, 4
- frame BATTLEANIMOAMSET_A9, 4
- frame BATTLEANIMOAMSET_AA, 4
- frame BATTLEANIMOAMSET_AB, 4
- frame BATTLEANIMOAMSET_AA, 4, OAM_X_FLIP
- frame BATTLEANIMOAMSET_A9, 4, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_A8, 4
+ oamframe BATTLEANIMOAMSET_A9, 4
+ oamframe BATTLEANIMOAMSET_AA, 4
+ oamframe BATTLEANIMOAMSET_AB, 4
+ oamframe BATTLEANIMOAMSET_AA, 4, OAM_X_FLIP
+ oamframe BATTLEANIMOAMSET_A9, 4, OAM_X_FLIP
+ oamrestart
.Frameset_87:
- frame BATTLEANIMOAMSET_1B, 8
- endanim
+ oamframe BATTLEANIMOAMSET_1B, 8
+ oamend
.Frameset_88:
- frame BATTLEANIMOAMSET_AC, 8
- endanim
+ oamframe BATTLEANIMOAMSET_AC, 8
+ oamend
.Frameset_89:
- frame BATTLEANIMOAMSET_AD, 8
- endanim
+ oamframe BATTLEANIMOAMSET_AD, 8
+ oamend
.Frameset_8a:
- frame BATTLEANIMOAMSET_AE, 8
- endanim
+ oamframe BATTLEANIMOAMSET_AE, 8
+ oamend
.Frameset_8b:
- frame BATTLEANIMOAMSET_AF, 8
- endanim
+ oamframe BATTLEANIMOAMSET_AF, 8
+ oamend
.Frameset_8c:
- frame BATTLEANIMOAMSET_B0, 32
- delanim
+ oamframe BATTLEANIMOAMSET_B0, 32
+ oamdelete
.Frameset_8d:
- frame BATTLEANIMOAMSET_B1, 7
- frame BATTLEANIMOAMSET_B1, 7, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_B1, 7
+ oamframe BATTLEANIMOAMSET_B1, 7, OAM_X_FLIP
+ oamrestart
.Frameset_8e:
- frame BATTLEANIMOAMSET_B2, 8
- endanim
+ oamframe BATTLEANIMOAMSET_B2, 8
+ oamend
.Frameset_8f:
- frame BATTLEANIMOAMSET_B3, 8
- endanim
+ oamframe BATTLEANIMOAMSET_B3, 8
+ oamend
.Frameset_90:
- frame BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP
+ oamend
.Frameset_91:
- frame BATTLEANIMOAMSET_B3, 8, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B3, 8, OAM_Y_FLIP
+ oamend
.Frameset_92:
- frame BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP, OAM_Y_FLIP
+ oamend
.Frameset_93:
- frame BATTLEANIMOAMSET_B5, 8
- endanim
+ oamframe BATTLEANIMOAMSET_B5, 8
+ oamend
.Frameset_94:
- frame BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP
+ oamend
.Frameset_95:
- frame BATTLEANIMOAMSET_B5, 8, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B5, 8, OAM_Y_FLIP
+ oamend
.Frameset_96:
- frame BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP, OAM_Y_FLIP
+ oamend
.Frameset_97:
- frame BATTLEANIMOAMSET_B4, 8
- endanim
+ oamframe BATTLEANIMOAMSET_B4, 8
+ oamend
.Frameset_98:
- frame BATTLEANIMOAMSET_6B, 8
- endanim
+ oamframe BATTLEANIMOAMSET_6B, 8
+ oamend
.Frameset_99:
- frame BATTLEANIMOAMSET_B6, 8
- endanim
+ oamframe BATTLEANIMOAMSET_B6, 8
+ oamend
.Frameset_9a:
- frame BATTLEANIMOAMSET_B7, 32
- endanim
+ oamframe BATTLEANIMOAMSET_B7, 32
+ oamend
.Frameset_9b:
- frame BATTLEANIMOAMSET_1B, 32
- endanim
+ oamframe BATTLEANIMOAMSET_1B, 32
+ oamend
.Frameset_9c:
- frame BATTLEANIMOAMSET_B8, 32
- endanim
+ oamframe BATTLEANIMOAMSET_B8, 32
+ oamend
.Frameset_9d:
- frame BATTLEANIMOAMSET_B8, 32, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_B8, 32, OAM_X_FLIP
+ oamend
.Frameset_9e:
- frame BATTLEANIMOAMSET_B9, 32
- endanim
+ oamframe BATTLEANIMOAMSET_B9, 32
+ oamend
.Frameset_9f:
- frame BATTLEANIMOAMSET_BA, 32
- endanim
+ oamframe BATTLEANIMOAMSET_BA, 32
+ oamend
.Frameset_a0:
- frame BATTLEANIMOAMSET_BB, 32, OAM_X_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_BB, 32, OAM_X_FLIP
+ oamend
.Frameset_a1:
- frame BATTLEANIMOAMSET_BB, 32
- endanim
+ oamframe BATTLEANIMOAMSET_BB, 32
+ oamend
.Frameset_a2:
- frame BATTLEANIMOAMSET_BC, 32
- endanim
+ oamframe BATTLEANIMOAMSET_BC, 32
+ oamend
.Frameset_a3:
- frame BATTLEANIMOAMSET_BD, 11
- frame BATTLEANIMOAMSET_BE, 11
- frame BATTLEANIMOAMSET_1B, 11
- delanim
+ oamframe BATTLEANIMOAMSET_BD, 11
+ oamframe BATTLEANIMOAMSET_BE, 11
+ oamframe BATTLEANIMOAMSET_1B, 11
+ oamdelete
.Frameset_a4:
- frame BATTLEANIMOAMSET_BF, 4
- frame BATTLEANIMOAMSET_C0, 4
- frame BATTLEANIMOAMSET_C1, 4
- delanim
+ oamframe BATTLEANIMOAMSET_BF, 4
+ oamframe BATTLEANIMOAMSET_C0, 4
+ oamframe BATTLEANIMOAMSET_C1, 4
+ oamdelete
.Frameset_a5:
- frame BATTLEANIMOAMSET_C2, 32
- frame BATTLEANIMOAMSET_C2, 32
- delanim
+ oamframe BATTLEANIMOAMSET_C2, 32
+ oamframe BATTLEANIMOAMSET_C2, 32
+ oamdelete
.Frameset_a6:
- frame BATTLEANIMOAMSET_4B, 2
- frame BATTLEANIMOAMSET_4C, 2
- frame BATTLEANIMOAMSET_4D, 32
- frame BATTLEANIMOAMSET_4D, 32
- frame BATTLEANIMOAMSET_4D, 32
- frame BATTLEANIMOAMSET_4F, 1
- frame BATTLEANIMOAMSET_50, 1
- frame BATTLEANIMOAMSET_51, 1
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- dowait 2
- frame BATTLEANIMOAMSET_52, 2
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 2
+ oamframe BATTLEANIMOAMSET_4C, 2
+ oamframe BATTLEANIMOAMSET_4D, 32
+ oamframe BATTLEANIMOAMSET_4D, 32
+ oamframe BATTLEANIMOAMSET_4D, 32
+ oamframe BATTLEANIMOAMSET_4F, 1
+ oamframe BATTLEANIMOAMSET_50, 1
+ oamframe BATTLEANIMOAMSET_51, 1
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2
+ oamdelete
.Frameset_a7:
- frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- dowait 2
- frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_50, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_51, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamwait 2
+ oamframe BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_a8:
- frame BATTLEANIMOAMSET_C3, 1
- frame BATTLEANIMOAMSET_C3, 1, OAM_X_FLIP, OAM_Y_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_C3, 1
+ oamframe BATTLEANIMOAMSET_C3, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamrestart
.Frameset_a9:
- frame BATTLEANIMOAMSET_C4, 32
- endanim
+ oamframe BATTLEANIMOAMSET_C4, 32
+ oamend
.Frameset_aa:
- frame BATTLEANIMOAMSET_C5, 4
- frame BATTLEANIMOAMSET_C6, 4
- frame BATTLEANIMOAMSET_C7, 4
- delanim
+ oamframe BATTLEANIMOAMSET_C5, 4
+ oamframe BATTLEANIMOAMSET_C6, 4
+ oamframe BATTLEANIMOAMSET_C7, 4
+ oamdelete
.Frameset_ab:
- frame BATTLEANIMOAMSET_C8, 1
- frame BATTLEANIMOAMSET_C8, 1, OAM_X_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_C8, 1
+ oamframe BATTLEANIMOAMSET_C8, 1, OAM_X_FLIP
+ oamrestart
.Frameset_ac:
- frame BATTLEANIMOAMSET_C9, 3
- frame BATTLEANIMOAMSET_05, 3
- delanim
+ oamframe BATTLEANIMOAMSET_C9, 3
+ oamframe BATTLEANIMOAMSET_05, 3
+ oamdelete
.Frameset_ad:
- frame BATTLEANIMOAMSET_CA, 32
- frame BATTLEANIMOAMSET_CB, 3
- frame BATTLEANIMOAMSET_CA, 3
- frame BATTLEANIMOAMSET_CB, 3
- dorestart
+ oamframe BATTLEANIMOAMSET_CA, 32
+ oamframe BATTLEANIMOAMSET_CB, 3
+ oamframe BATTLEANIMOAMSET_CA, 3
+ oamframe BATTLEANIMOAMSET_CB, 3
+ oamrestart
.Frameset_ae:
- frame BATTLEANIMOAMSET_03, 32, OAM_Y_FLIP
- endanim
+ oamframe BATTLEANIMOAMSET_03, 32, OAM_Y_FLIP
+ oamend
.Frameset_b0:
- frame BATTLEANIMOAMSET_CC, 32
- endanim
+ oamframe BATTLEANIMOAMSET_CC, 32
+ oamend
.Frameset_b1:
- frame BATTLEANIMOAMSET_7F, 2
- frame BATTLEANIMOAMSET_25, 2
- frame BATTLEANIMOAMSET_80, 2
- frame BATTLEANIMOAMSET_25, 2
- dorestart
+ oamframe BATTLEANIMOAMSET_7F, 2
+ oamframe BATTLEANIMOAMSET_25, 2
+ oamframe BATTLEANIMOAMSET_80, 2
+ oamframe BATTLEANIMOAMSET_25, 2
+ oamrestart
.Frameset_b2:
- frame BATTLEANIMOAMSET_CD, 4
- frame BATTLEANIMOAMSET_CE, 4
- frame BATTLEANIMOAMSET_CD, 4, OAM_X_FLIP, OAM_Y_FLIP
- frame BATTLEANIMOAMSET_CE, 4, OAM_X_FLIP, OAM_Y_FLIP
- dorestart
+ oamframe BATTLEANIMOAMSET_CD, 4
+ oamframe BATTLEANIMOAMSET_CE, 4
+ oamframe BATTLEANIMOAMSET_CD, 4, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe BATTLEANIMOAMSET_CE, 4, OAM_X_FLIP, OAM_Y_FLIP
+ oamrestart
.Frameset_b3:
- frame BATTLEANIMOAMSET_CF, 4
- frame BATTLEANIMOAMSET_D0, 4
- frame BATTLEANIMOAMSET_D1, 4
- frame BATTLEANIMOAMSET_D2, 4
- delanim
+ oamframe BATTLEANIMOAMSET_CF, 4
+ oamframe BATTLEANIMOAMSET_D0, 4
+ oamframe BATTLEANIMOAMSET_D1, 4
+ oamframe BATTLEANIMOAMSET_D2, 4
+ oamdelete
.Frameset_b4:
- frame BATTLEANIMOAMSET_D3, 32
- endanim
+ oamframe BATTLEANIMOAMSET_D3, 32
+ oamend
.Frameset_b5:
- frame BATTLEANIMOAMSET_D4, 8
- endanim
+ oamframe BATTLEANIMOAMSET_D4, 8
+ oamend
.Frameset_b6:
- frame BATTLEANIMOAMSET_D5, 8
- endanim
+ oamframe BATTLEANIMOAMSET_D5, 8
+ oamend
.Frameset_b7:
- frame BATTLEANIMOAMSET_D6, 8
- endanim
+ oamframe BATTLEANIMOAMSET_D6, 8
+ oamend
.Frameset_b8:
- frame BATTLEANIMOAMSET_D7, 8
- endanim
+ oamframe BATTLEANIMOAMSET_D7, 8
+ oamend
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index b7ebc3352..115d82dca 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -70,430 +70,430 @@ SpriteAnimFrameData:
assert_table_length NUM_SPRITE_ANIM_FRAMESETS
.Frameset_00:
- frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_1, 32
+ oamend
.Frameset_PartyMon:
- frame SPRITE_ANIM_OAMSET_RED_WALK_1, 8
- frame SPRITE_ANIM_OAMSET_RED_WALK_2, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_1, 8
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_2, 8
+ oamrestart
.Frameset_PartyMonWithMail:
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1, 8
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1, 8
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2, 8
+ oamrestart
.Frameset_PartyMonWithItem:
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1, 8
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1, 8
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2, 8
+ oamrestart
.Frameset_PartyMonFast:
- frame SPRITE_ANIM_OAMSET_RED_WALK_1, 4
- frame SPRITE_ANIM_OAMSET_RED_WALK_2, 4
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_1, 4
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_2, 4
+ oamrestart
.Frameset_PartyMonWithMailFast:
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1, 4
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2, 4
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1, 4
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2, 4
+ oamrestart
.Frameset_PartyMonWithItemFast:
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1, 4
- frame SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2, 4
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1, 4
+ oamframe SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2, 4
+ oamrestart
.Frameset_RedWalk:
- frame SPRITE_ANIM_OAMSET_RED_WALK_1, 8
- frame SPRITE_ANIM_OAMSET_RED_WALK_2, 8
- frame SPRITE_ANIM_OAMSET_RED_WALK_1, 8
- frame SPRITE_ANIM_OAMSET_RED_WALK_2, 8, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_1, 8
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_2, 8
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_1, 8
+ oamframe SPRITE_ANIM_OAMSET_RED_WALK_2, 8, OAM_X_FLIP
+ oamrestart
.Frameset_BlueWalk:
- frame SPRITE_ANIM_OAMSET_BLUE_WALK_1, 8
- frame SPRITE_ANIM_OAMSET_BLUE_WALK_2, 8
- frame SPRITE_ANIM_OAMSET_BLUE_WALK_1, 8
- frame SPRITE_ANIM_OAMSET_BLUE_WALK_2, 8, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_BLUE_WALK_1, 8
+ oamframe SPRITE_ANIM_OAMSET_BLUE_WALK_2, 8
+ oamframe SPRITE_ANIM_OAMSET_BLUE_WALK_1, 8
+ oamframe SPRITE_ANIM_OAMSET_BLUE_WALK_2, 8, OAM_X_FLIP
+ oamrestart
.Frameset_MagnetTrainBlue:
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2, 8, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2, 8, OAM_X_FLIP
+ oamrestart
.Frameset_GSTitleTrail:
- frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 1
- frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2, 1
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 1
+ oamframe SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2, 1
+ oamrestart
.Frameset_TextEntryCursor:
- frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR, 1
- dowait 1
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR, 1
+ oamwait 1
+ oamrestart
.Frameset_TextEntryCursorBig:
- frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
- dowait 1
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
+ oamwait 1
+ oamrestart
.Frameset_GameFreakLogo:
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1, 12
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 1
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3, 1
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 4
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1, 12
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 12
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3, 4
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4, 32
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5, 3
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6, 3
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7, 4
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8, 4
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9, 4
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10, 10
- frame SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11, 7
- endanim
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1, 12
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 1
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3, 1
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 4
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1, 12
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2, 12
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3, 4
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4, 32
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5, 3
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6, 3
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7, 4
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8, 4
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9, 4
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10, 10
+ oamframe SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11, 7
+ oamend
.Frameset_GSGameFreakLogoStar:
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR, 3
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR, 3, OAM_Y_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR, 3
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR, 3, OAM_Y_FLIP
+ oamrestart
.Frameset_GSGameFreakLogoSparkle:
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_1, 2
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2, 2
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_3, 2
- frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2, 2
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_1, 2
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2, 2
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_3, 2
+ oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2, 2
+ oamrestart
.Frameset_SlotsGolem:
- frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1, 7, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2, 7, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1, 7, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2, 7, OAM_X_FLIP
+ oamrestart
.Frameset_SlotsChansey:
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3, 7
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3, 7
+ oamrestart
.Frameset_SlotsChansey2:
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4, 7
- frame SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
- endanim
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4, 7
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1, 7
+ oamend
.Frameset_SlotsEgg:
- frame SPRITE_ANIM_OAMSET_SLOTS_EGG, 20
- endanim
+ oamframe SPRITE_ANIM_OAMSET_SLOTS_EGG, 20
+ oamend
.Frameset_StillCursor:
- frame SPRITE_ANIM_OAMSET_STILL_CURSOR, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_STILL_CURSOR, 32
+ oamend
.Frameset_TradePokeBall:
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32
+ oamend
.Frameset_TradePokeBallWobble:
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamrestart
.Frameset_TradePoof:
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_1, 4
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_2, 4
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_3, 4
- delanim
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_1, 4
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_2, 4
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_3, 4
+ oamdelete
.Frameset_TradeTubeBulge:
- frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2, 3
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2, 3
+ oamrestart
.Frameset_TrademonIcon:
- frame SPRITE_ANIM_OAMSET_TRADEMON_ICON_1, 7
- frame SPRITE_ANIM_OAMSET_TRADEMON_ICON_2, 7
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TRADEMON_ICON_1, 7
+ oamframe SPRITE_ANIM_OAMSET_TRADEMON_ICON_2, 7
+ oamrestart
.Frameset_TrademonBubble:
- frame SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE, 32
+ oamend
.Frameset_EvolutionBallOfLight:
- frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2, 2
- frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1, 2
- frame SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2, 2
+ oamframe SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1, 2
+ oamframe SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2, 2
+ oamend
.Frameset_RadioTuningKnob:
- frame SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB, 32
+ oamend
.Frameset_MagnetTrainRed:
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1, 8
- frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1, 8
+ oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP
+ oamrestart
.Frameset_Unknown1: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_43, 8
- frame SPRITE_ANIM_OAMSET_UNUSED_44, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_43, 8
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_44, 8
+ oamrestart
.Frameset_Unknown2: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_45, 8
- frame SPRITE_ANIM_OAMSET_UNUSED_46, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_45, 8
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_46, 8
+ oamrestart
.Frameset_Unknown3: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_47, 8
- frame SPRITE_ANIM_OAMSET_UNUSED_48, 8
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_47, 8
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_48, 8
+ oamrestart
.Frameset_Unknown4: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_49, 1
- frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_49, 1
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP
+ oamrestart
.Frameset_Unknown5: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_4A, 32
+ oamend
.Frameset_Unknown6: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_4B, 32
+ oamend
.Frameset_Unknown7: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_4C, 32
+ oamend
.Frameset_Unknown8: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_4D, 32
+ oamend
.Frameset_Unknown9: ; unreferenced
- frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3
- dowait 3
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_UNUSED_4E, 3
+ oamwait 3
+ oamrestart
.Frameset_Unused1C:
- dowait 32
- endanim
+ oamwait 32
+ oamend
.Frameset_Leaf:
- frame SPRITE_ANIM_OAMSET_LEAF, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_LEAF, 32
+ oamend
.Frameset_CutTree:
- frame SPRITE_ANIM_OAMSET_TREE_1, 2
- frame SPRITE_ANIM_OAMSET_CUT_TREE_2, 16
- dowait 1
- frame SPRITE_ANIM_OAMSET_CUT_TREE_3, 1
- dowait 1
- frame SPRITE_ANIM_OAMSET_CUT_TREE_4, 1
- delanim
+ oamframe SPRITE_ANIM_OAMSET_TREE_1, 2
+ oamframe SPRITE_ANIM_OAMSET_CUT_TREE_2, 16
+ oamwait 1
+ oamframe SPRITE_ANIM_OAMSET_CUT_TREE_3, 1
+ oamwait 1
+ oamframe SPRITE_ANIM_OAMSET_CUT_TREE_4, 1
+ oamdelete
.Frameset_EggCrack:
- frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EGG_CRACK, 32
+ oamend
.Frameset_EggHatch1:
- frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EGG_HATCH, 32
+ oamend
.Frameset_EggHatch2:
- frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP
+ oamend
.Frameset_EggHatch3:
- frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP
+ oamend
.Frameset_EggHatch4:
- frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
+ oamend
.Frameset_GSIntroHoOhLugia:
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1, 10
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2, 9
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 10
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4, 10
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 9
+ oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10
+ oamrestart
.Frameset_HeadbuttTree:
- frame SPRITE_ANIM_OAMSET_TREE_1, 2
- frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2
- frame SPRITE_ANIM_OAMSET_TREE_1, 2
- frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_TREE_1, 2
+ oamframe SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2
+ oamframe SPRITE_ANIM_OAMSET_TREE_1, 2
+ oamframe SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP
+ oamrestart
.Frameset_EZChatCursor1:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2
+ oamend
.Frameset_EZChatCursor2:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2
+ oamend
.Frameset_EZChatCursor3:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2
+ oamend
.Frameset_EZChatCursor4:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2
+ oamend
.Frameset_EZChatCursor5:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2
+ oamend
.Frameset_EZChatCursor6:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2
+ oamend
.Frameset_EZChatCursor7:
- frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2
- endanim
+ oamframe SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2
+ oamend
.Frameset_MobileTradeSentBall:
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_3, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- endanim
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_3, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamend
.Frameset_MobileTradeOTBall:
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_1, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_2, 3
- frame SPRITE_ANIM_OAMSET_TRADE_POOF_3, 3
- delanim
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_1, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_2, 3
+ oamframe SPRITE_ANIM_OAMSET_TRADE_POOF_3, 3
+ oamdelete
.Frameset_MobileTradeCableBulge:
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1, 3
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2, 3
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1, 3
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2, 3
+ oamrestart
.Frameset_MobileTradeSentPulse:
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE, 3
- endanim
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE, 3
+ oamend
.Frameset_MobileTradeOTPulse:
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE, 3
- endanim
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE, 3
+ oamend
.Frameset_MobileTradePing:
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1, 2
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2, 2
- frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3, 2
- delanim
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1, 2
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2, 2
+ oamframe SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3, 2
+ oamdelete
.Frameset_IntroSuicune:
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1, 3
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2, 3
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3, 3
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4, 3
- dorestart
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4, 3
+ oamrestart
.Frameset_IntroSuicune2:
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4, 3
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1, 7
- endanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1, 7
+ oamend
.Frameset_IntroPichu:
- frame SPRITE_ANIM_OAMSET_INTRO_PICHU_1, 32
- frame SPRITE_ANIM_OAMSET_INTRO_PICHU_2, 7
- frame SPRITE_ANIM_OAMSET_INTRO_PICHU_3, 7
- endanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_PICHU_1, 32
+ oamframe SPRITE_ANIM_OAMSET_INTRO_PICHU_2, 7
+ oamframe SPRITE_ANIM_OAMSET_INTRO_PICHU_3, 7
+ oamend
.Frameset_IntroWooper:
- frame SPRITE_ANIM_OAMSET_INTRO_WOOPER, 3
- endanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_WOOPER, 3
+ oamend
.Frameset_IntroUnown1:
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7
- delanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7
+ oamdelete
.Frameset_IntroUnown2:
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_X_FLIP
- delanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_X_FLIP
+ oamdelete
.Frameset_IntroUnown3:
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_Y_FLIP
- delanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_Y_FLIP
+ oamdelete
.Frameset_IntroUnown4:
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_X_FLIP, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_X_FLIP, OAM_Y_FLIP
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_X_FLIP, OAM_Y_FLIP
- delanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_1, 3, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_2, 3, OAM_X_FLIP, OAM_Y_FLIP
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_3, 7, OAM_X_FLIP, OAM_Y_FLIP
+ oamdelete
.Frameset_IntroUnownF2:
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1, 3
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2, 3
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3, 3
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4, 7
- frame SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5, 7
- endanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3, 3
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4, 7
+ oamframe SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5, 7
+ oamend
.Frameset_IntroSuicuneAway:
- frame SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY, 3
- endanim
+ oamframe SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY, 3
+ oamend
.Frameset_IntroUnownF:
- dowait 0
- endanim
+ oamwait 0
+ oamend
.Frameset_CelebiLeft:
- frame SPRITE_ANIM_OAMSET_CELEBI_1, 8
- frame SPRITE_ANIM_OAMSET_CELEBI_2, 8
- endanim
+ oamframe SPRITE_ANIM_OAMSET_CELEBI_1, 8
+ oamframe SPRITE_ANIM_OAMSET_CELEBI_2, 8
+ oamend
.Frameset_CelebiRight:
- frame SPRITE_ANIM_OAMSET_CELEBI_1, 8, OAM_X_FLIP
- frame SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP
- endanim
+ oamframe SPRITE_ANIM_OAMSET_CELEBI_1, 8, OAM_X_FLIP
+ oamframe SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP
+ oamend
diff --git a/docs/pic_animations.md b/docs/pic_animations.md
index e42f2c1e7..dd173896d 100644
--- a/docs/pic_animations.md
+++ b/docs/pic_animations.md
@@ -1,6 +1,6 @@
# Pic Animations
-Defined in [macros/scripts/gfx_anims.asm](https://github.com/pret/pokecrystal/blob/master/macros/scripts/gfx_anims.asm).
+Defined in [macros/scripts/pic_anims.asm](https://github.com/pret/pokecrystal/blob/master/macros/scripts/pic_anims.asm).
Pic animations are assembled in 3 parts:
@@ -8,7 +8,7 @@ Pic animations are assembled in 3 parts:
- frame N, duration: Frame #0 is the original pic (no change)
- setrepeat N: Sets the number of times to repeat
- dorepeat I: Repeats from command #I (with the first command being #0)
- - `end`
+ - `endanim`
- Bitmasks:
Layered over the pic to designate affected tiles
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 64be8839d..820af73af 100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -80,9 +80,9 @@ endr
BattleAnimOAMUpdate:
call InitBattleAnimBuffer
call GetBattleAnimFrame
- cp dowait_command
+ cp oamwait_command
jp z, .done
- cp delanim_command
+ cp oamdelete_command
jp z, .delete
push af
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm
index 6685ab733..90d9feab4 100644
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -29,9 +29,9 @@ GetBattleAnimFrame:
inc [hl]
call .GetPointer
ld a, [hli]
- cp dorestart_command
+ cp oamrestart_command
jr z, .restart
- cp endanim_command
+ cp oamend_command
jr z, .repeat_last
push af
@@ -44,7 +44,7 @@ GetBattleAnimFrame:
pop hl
.okay
ld a, [hl]
- and Y_FLIP << 1 | X_FLIP << 1 ; The << 1 is compensated in the "frame" macro
+ and Y_FLIP << 1 | X_FLIP << 1 ; The << 1 is compensated in the "oamframe" macro
srl a
ld [wBattleAnimTempFrameOAMFlags], a
pop af
diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm
index b3c781625..224535c90 100644
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -229,9 +229,9 @@ DeinitializeAllSprites:
UpdateAnimFrame:
call InitSpriteAnimBuffer ; init WRAM
call GetSpriteAnimFrame ; read from a memory array
- cp dowait_command
+ cp oamwait_command
jr z, .done
- cp delanim_command
+ cp oamdelete_command
jr z, .delete
call GetFrameOAMPointer
; add byte to [wCurAnimVTile]
@@ -303,6 +303,7 @@ UpdateAnimFrame:
jr .done
.delete
+; Removes the object from the screen, as opposed to `oamend` which just stops all motion
call DeinitializeSprite
.done
and a
@@ -428,9 +429,9 @@ GetSpriteAnimFrame:
inc [hl]
call .GetPointer
ld a, [hli]
- cp dorestart_command
+ cp oamrestart_command
jr z, .restart
- cp endanim_command
+ cp oamend_command
jr z, .repeat_last
push af
@@ -446,7 +447,7 @@ GetSpriteAnimFrame:
pop hl
.okay
ld a, [hl]
- and Y_FLIP << 1 | X_FLIP << 1 ; The << 1 is compensated in the "frame" macro
+ and Y_FLIP << 1 | X_FLIP << 1 ; The << 1 is compensated in the "oamframe" macro
srl a
ld [wCurSpriteOAMFlags], a
pop af
diff --git a/macros.asm b/macros.asm
index 93f424d92..0a92913d9 100644
--- a/macros.asm
+++ b/macros.asm
@@ -15,6 +15,7 @@ INCLUDE "macros/scripts/text.asm"
INCLUDE "macros/scripts/movement.asm"
INCLUDE "macros/scripts/battle_commands.asm"
INCLUDE "macros/scripts/battle_anims.asm"
-INCLUDE "macros/scripts/gfx_anims.asm"
+INCLUDE "macros/scripts/oam_anims.asm"
+INCLUDE "macros/scripts/pic_anims.asm"
INCLUDE "macros/legacy.asm"
diff --git a/macros/legacy.asm b/macros/legacy.asm
index acff5200d..44118586c 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -338,6 +338,11 @@ DEF anim_enemyfeetobj EQUS "anim_battlergfx_2row"
DEF anim_playerheadobj EQUS "anim_battlergfx_1row"
DEF anim_clearsprites EQUS "anim_keepsprites"
+; macros/scripts/oam_anims.asm
+DEF dorestart EQUS "oamrestart"
+DEF dowait EQUS "oamwait"
+DEF delanim EQUS "oamdel"
+
; engine/events/std_scripts.asm
DEF pokecenternurse EQUS "PokecenterNurseScript"
DEF difficultbookshelf EQUS "DifficultBookshelfScript"
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm
deleted file mode 100644
index f3086046f..000000000
--- a/macros/scripts/gfx_anims.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-; pic + oam animations
-
-MACRO frame
- db \1
- DEF x = \2
- if _NARG > 2
- rept _NARG - 2
- DEF x |= 1 << (\3 + 1)
- shift
- endr
- endc
- db x
-ENDM
-
- const_def -1, -1
-
- const endanim_command ; $ff
-MACRO endanim
- db endanim_command
-ENDM
-
- const dorestart_command ; $fe
-MACRO dorestart
- db dorestart_command
-ENDM
-
- const dowait_command ; $fd
-MACRO dowait
- db dowait_command
- db \1 ; frames
-ENDM
-
- const delanim_command ; $fc
-MACRO delanim
-; Removes the object from the screen, as opposed to `endanim` which just stops all motion
- db delanim_command
-ENDM
-
-
-; Used for pic animations
- const_def -2, -1
-
- const setrepeat_command ; $fe
-MACRO setrepeat
- db setrepeat_command
- db \1 ; amount of times to repeat
-ENDM
-
- const dorepeat_command ; $fd
-MACRO dorepeat
- db dorepeat_command
- db \1 ; command offset to jump to
-ENDM
diff --git a/macros/scripts/oam_anims.asm b/macros/scripts/oam_anims.asm
new file mode 100644
index 000000000..f3fa9bfbe
--- /dev/null
+++ b/macros/scripts/oam_anims.asm
@@ -0,0 +1,38 @@
+; Battle and sprite OAM animations
+
+MACRO oamframe
+ db \1 ; duration
+ DEF x = \2
+ assert !(x & (1 << (OAM_X_FLIP + 1) | 1 << (OAM_Y_FLIP + 1))), \
+ "oamframe duration overflows into X/Y flip bits"
+ if _NARG > 2
+ rept _NARG - 2
+ DEF x |= 1 << (\3 + 1)
+ shift
+ endr
+ endc
+ db x ; flags
+ENDM
+
+ const_def -1, -1
+
+ const oamend_command ; $ff
+MACRO oamend
+ db oamend_command
+ENDM
+
+ const oamrestart_command ; $fe
+MACRO oamrestart
+ db oamrestart_command
+ENDM
+
+ const oamwait_command ; $fd
+MACRO oamwait
+ db oamwait_command
+ db \1 ; frames
+ENDM
+
+ const oamdelete_command ; $fc
+MACRO oamdelete
+ db oamdelete_command
+ENDM
diff --git a/macros/scripts/pic_anims.asm b/macros/scripts/pic_anims.asm
new file mode 100644
index 000000000..45320460b
--- /dev/null
+++ b/macros/scripts/pic_anims.asm
@@ -0,0 +1,28 @@
+MACRO frame
+ if _NARG <= 2
+ db \1 ; index
+ db \2 ; duration
+ else
+ ; LEGACY: Support for the old name of "oamanim"
+ oamanim \#
+ endc
+ENDM
+
+ const_def -1, -1
+
+ const endanim_command ; $ff
+MACRO endanim
+ db endanim_command
+ENDM
+
+ const setrepeat_command ; $fe
+MACRO setrepeat
+ db setrepeat_command
+ db \1 ; amount of times to repeat
+ENDM
+
+ const dorepeat_command ; $fd
+MACRO dorepeat
+ db dorepeat_command
+ db \1 ; command offset to jump to
+ENDM