Split "gfx anims" into "pic anims" and "sprite anims"

data/sprite_anims/framesets.asm

@@ -60,344 +60,344 @@ 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_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_GSIntroBubble:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1,  8
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2,  8
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1,  8
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2,  8
+	oamrestart
 
 .Frameset_GSIntroShellder:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1,  8
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2,  8
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1,  8
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2,  8
+	oamrestart
 
 .Frameset_GSIntroMagikarp:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1,  1, OAM_X_FLIP
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2,  1, OAM_X_FLIP
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1,  1, OAM_X_FLIP
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2,  1, OAM_X_FLIP
+	oamrestart
 
 .Frameset_UnusedIntroAerodactyl:
-	frame SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL,  7, OAM_X_FLIP
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL,  7, OAM_X_FLIP
+	oamend
 
 .Frameset_GSIntroLapras:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1,  7
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1,  7
+	oamrestart
 
 .Frameset_GSIntroNote:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_NOTE,  8
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_NOTE,  8
+	oamend
 
 .Frameset_GSIntroInvisibleNote:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE,  8
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE,  8
+	oamend
 
 .Frameset_GSIntroJigglypuff:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25, OAM_X_FLIP
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3,  9
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3,  9
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25, OAM_X_FLIP
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3,  9
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3,  9
+	oamrestart
 
 .Frameset_GSIntroJigglypuff2:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32
+	oamend
 
 .Frameset_GSIntroPikachu:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1,  4
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  5
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4,  4
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1,  4
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  5
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4,  4
+	oamrestart
 
 .Frameset_GSIntroPikachu2:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  8
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  8
+	oamend
 
 .Frameset_GSIntroPikachu3:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32
+	oamend
 
 .Frameset_GSIntroPikachuTail:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1,  3
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2,  3
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3,  3
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2,  3
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1,  3
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2,  3
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3,  3
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2,  3
+	oamrestart
 
 .Frameset_GSIntroPikachuTail2:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, 31
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, 31
+	oamend
 
 .Frameset_GSIntroFireball:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL,  1
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL,  1
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL,  1
-	delanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL,  1
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL,  1
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL,  1
+	oamdelete
 
 .Frameset_GSIntroChikorita:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, 24
-	delanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, 24
+	oamdelete
 
 .Frameset_GSIntroCyndaquil:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, 24, OAM_X_FLIP
-	delanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, 24, OAM_X_FLIP
+	oamdelete
 
 .Frameset_GSIntroTotodile:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, 24
-	delanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, 24
+	oamdelete
 
 .Frameset_GSTitleTrail:
 IF DEF(_GOLD)
-	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
 ELIF DEF(_SILVER)
-	frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32
+	oamend
 ENDC
 
 .Frameset_GSIntroPikachu4:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  0
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2,  0
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15
+	oamend
 
 .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_GS_GAMEFREAK_LOGO,  8
-	endanim
+	oamframe SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO,  8
+	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_Unused2E:
-	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:
 IF DEF(_GOLD)
-	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
 ELIF DEF(_SILVER)
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  3
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  3
-	dorestart
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  3
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  7
+	oamframe SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  3
+	oamrestart
 ENDC
 
 .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

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

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

engine/gfx/sprites.asm

@@ -216,9 +216,9 @@ DeinitializeSprite:
 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]
@@ -290,6 +290,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
@@ -415,9 +416,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
@@ -433,7 +434,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

macros.asm

@@ -15,6 +15,6 @@ 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/legacy.asm"

macros/legacy.asm

@@ -337,6 +337,13 @@ 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 frame EQUS "oamframe"
+DEF endanim EQUS "oamend"
+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"

macros/scripts/gfx_anims.asm

@@ -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

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