Sync with pokecrystal up to aba1f14

engine/battle_anims/anim_commands.asm

@@ -116,7 +116,7 @@ RunBattleAnimScript:
 	cp ROLLOUT
 	jr nz, .not_rollout
 
-	ld a, ANIM_BG_ROLLOUT
+	ld a, BATTLE_BG_EFFECT_ROLLOUT
 	ld b, NUM_BG_EFFECTS
 	ld de, BG_EFFECT_STRUCT_LENGTH
 	ld hl, wBGEffect1Function
@@ -645,7 +645,7 @@ BattleAnimCmd_ResetObp0:
 
 BattleAnimCmd_ClearObjs:
 	ld hl, wActiveAnimObjects
-	ld a, NUM_ANIM_OBJECTS * BATTLEANIMSTRUCT_LENGTH
+	ld a, NUM_BATTLE_ANIM_STRUCTS * BATTLEANIMSTRUCT_LENGTH
 .loop
 	ld [hl], 0
 	inc hl
@@ -695,7 +695,7 @@ endr
 
 BattleAnimCmd_IncObj:
 	call GetBattleAnimByte
-	ld e, NUM_ANIM_OBJECTS
+	ld e, NUM_BATTLE_ANIM_STRUCTS
 	ld bc, wActiveAnimObjects
 .loop
 	ld hl, BATTLEANIMSTRUCT_INDEX
@@ -745,7 +745,7 @@ BattleAnimCmd_IncBGEffect:
 
 BattleAnimCmd_SetObj:
 	call GetBattleAnimByte
-	ld e, NUM_ANIM_OBJECTS
+	ld e, NUM_BATTLE_ANIM_STRUCTS
 	ld bc, wActiveAnimObjects
 .loop
 	ld hl, BATTLEANIMSTRUCT_INDEX
@@ -780,11 +780,11 @@ BattleAnimCmd_BattlerGFX_1Row:
 	jr .loop
 
 .okay
-	ld a, ANIM_GFX_PLAYERHEAD
+	ld a, BATTLE_ANIM_GFX_PLAYERHEAD
 	ld [hli], a
 	ld a, ($80 - 6 - 7) - BATTLEANIM_BASE_TILE
 	ld [hli], a
-	ld a, ANIM_GFX_ENEMYFEET
+	ld a, BATTLE_ANIM_GFX_ENEMYFEET
 	ld [hli], a
 	ld a, ($80 - 6) - BATTLEANIM_BASE_TILE
 	ld [hl], a
@@ -834,11 +834,11 @@ BattleAnimCmd_BattlerGFX_2Row:
 	jr .loop
 
 .okay
-	ld a, ANIM_GFX_PLAYERHEAD
+	ld a, BATTLE_ANIM_GFX_PLAYERHEAD
 	ld [hli], a
 	ld a, ($80 - 6 * 2 - 7 * 2) - BATTLEANIM_BASE_TILE
 	ld [hli], a
-	ld a, ANIM_GFX_ENEMYFEET
+	ld a, BATTLE_ANIM_GFX_ENEMYFEET
 	ld [hli], a
 	ld a, ($80 - 6 * 2) - BATTLEANIM_BASE_TILE
 	ld [hl], a
@@ -1422,7 +1422,7 @@ BattleAnim_UpdateOAM_All:
 	ld a, 0
 	ld [wBattleAnimOAMPointerLo], a
 	ld hl, wActiveAnimObjects
-	ld e, NUM_ANIM_OBJECTS
+	ld e, NUM_BATTLE_ANIM_STRUCTS
 .loop
 	ld a, [hl]
 	and a

engine/battle_anims/bg_effects.asm

@@ -78,7 +78,7 @@ DoBattleBGEffectFunction:
 	jp hl
 
 BattleBGEffects:
-; entries correspond to ANIM_BG_* constants
+; entries correspond to BATTLE_BG_EFFECT_* constants
 	dw BattleBGEffect_End
 	dw BattleBGEffect_FlashInverted
 	dw BattleBGEffect_FlashWhite
@@ -402,13 +402,13 @@ BattleBGEffect_BattlerObj_1Row:
 	push bc
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_side
-	ld a, ANIM_OBJ_ENEMYFEET_1ROW
+	ld a, BATTLE_ANIM_OBJ_ENEMYFEET_1ROW
 	ld [wBattleObjectTempID], a
 	ld a, 16 * TILE_WIDTH + 4
 	jr .okay
 
 .player_side
-	ld a, ANIM_OBJ_PLAYERHEAD_1ROW
+	ld a, BATTLE_ANIM_OBJ_PLAYERHEAD_1ROW
 	ld [wBattleObjectTempID], a
 	ld a, 6 * TILE_WIDTH
 .okay
@@ -469,13 +469,13 @@ BattleBGEffect_BattlerObj_2Row:
 	push bc
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_side
-	ld a, ANIM_OBJ_ENEMYFEET_2ROW
+	ld a, BATTLE_ANIM_OBJ_ENEMYFEET_2ROW
 	ld [wBattleObjectTempID], a
 	ld a, 16 * TILE_WIDTH + 4
 	jr .okay
 
 .player_side
-	ld a, ANIM_OBJ_PLAYERHEAD_2ROW
+	ld a, BATTLE_ANIM_OBJ_PLAYERHEAD_2ROW
 	ld [wBattleObjectTempID], a
 	ld a, 6 * TILE_WIDTH
 .okay

engine/battle_anims/core.asm

@@ -1,6 +1,6 @@
 QueueBattleAnimation:
 	ld hl, wActiveAnimObjects
-	ld e, NUM_ANIM_OBJECTS
+	ld e, NUM_BATTLE_ANIM_STRUCTS
 .loop
 	ld a, [hl]
 	and a

engine/events/celebi.asm

@@ -14,14 +14,14 @@ CelebiShrineEvent:
 	ld [wVramState], a
 	call LoadCelebiGFX
 	depixel 0, 10, 7, 0
-	ld a, SPRITE_ANIM_INDEX_CELEBI
+	ld a, SPRITE_ANIM_OBJ_CELEBI
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], SPECIALCELEBIEVENT_CELEBI
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_CELEBI
+	ld [hl], SPRITE_ANIM_FUNC_CELEBI
 	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld a, $80
@@ -111,7 +111,7 @@ CelebiEvent_SpawnLeaf: ; unreferenced
 	add $40
 	ld d, a
 	ld e, $0
-	ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
+	ld a, SPRITE_ANIM_OBJ_FLY_LEAF ; fly land
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc

engine/events/field_moves.asm

@@ -31,7 +31,7 @@ ShakeHeadbuttTree:
 	lb bc, BANK(HeadbuttTreeGFX), 8
 	call Request2bpp
 	call Cut_Headbutt_GetPixelFacing
-	ld a, SPRITE_ANIM_INDEX_HEADBUTT
+	ld a, SPRITE_ANIM_OBJ_HEADBUTT
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -163,7 +163,7 @@ OWCutJumptable:
 
 Cut_SpawnAnimateTree:
 	call Cut_Headbutt_GetPixelFacing
-	ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
+	ld a, SPRITE_ANIM_OBJ_CUT_TREE ; cut tree
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -216,7 +216,7 @@ Cut_WaitAnimSFX:
 Cut_SpawnLeaf:
 	push de
 	push af
-	ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
+	ld a, SPRITE_ANIM_OBJ_LEAF ; leaf
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -303,14 +303,14 @@ FlyFromAnim:
 	ld [wVramState], a
 	call FlyFunction_InitGFX
 	depixel 10, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_RED_WALK
+	ld a, SPRITE_ANIM_OBJ_RED_WALK
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], FIELDMOVE_FLY
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_FLY_FROM
+	ld [hl], SPRITE_ANIM_FUNC_FLY_FROM
 	ld a, 128
 	ld [wFrameCounter], a
 .loop
@@ -337,14 +337,14 @@ FlyToAnim:
 	ld [wVramState], a
 	call FlyFunction_InitGFX
 	depixel 31, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_RED_WALK
+	ld a, SPRITE_ANIM_OBJ_RED_WALK
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], FIELDMOVE_FLY
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_FLY_TO
+	ld [hl], SPRITE_ANIM_FUNC_FLY_TO
 	ld hl, SPRITEANIMSTRUCT_VAR4
 	add hl, bc
 	ld [hl], 11 * TILE_WIDTH
@@ -436,7 +436,7 @@ FlyFunction_FrameTimer:
 	add 8 * 8 ; gives a number in [$40, $50, $60, $70]
 	ld d, a
 	ld e, 0
-	ld a, SPRITE_ANIM_INDEX_FLY_LEAF
+	ld a, SPRITE_ANIM_OBJ_FLY_LEAF
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc

engine/events/magnet_train.asm

@@ -292,7 +292,7 @@ MagnetTrain_Jumptable:
 	ld d, (8 + 2) * TILE_WIDTH + 5
 	ld a, [wMagnetTrainPlayerSpriteInitX]
 	ld e, a
-	ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
+	ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED
 	ldh a, [rSVBK]
 	push af
 	ld a, BANK(wPlayerGender)
@@ -300,7 +300,7 @@ MagnetTrain_Jumptable:
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
-	ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
+	ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_BLUE
 .got_gender
 	pop af
 	ldh [rSVBK], a

engine/games/memory_game.asm

@@ -109,7 +109,7 @@ endr
 
 .spawn_object
 	depixel 6, 3, 4, 4
-	ld a, SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR
+	ld a, SPRITE_ANIM_OBJ_MEMORY_GAME_CURSOR
 	call InitSpriteAnimStruct
 	ld a, 5
 	ld [wMemoryGameNumberTriesRemaining], a

engine/games/slot_machine.asm

@@ -1147,7 +1147,7 @@ ReelAction_InitGolem:
 	push bc
 	push af
 	depixel 12, 13
-	ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
+	ld a, SPRITE_ANIM_OBJ_SLOTS_GOLEM
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_VAR3
 	add hl, bc
@@ -1208,7 +1208,7 @@ ReelAction_InitChansey:
 	ld [hl], 0
 	push bc
 	depixel 12, 0
-	ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	ld a, SPRITE_ANIM_OBJ_SLOTS_CHANSEY
 	call InitSpriteAnimStruct
 	pop bc
 	xor a
@@ -2129,7 +2129,7 @@ Slots_AnimateChansey:
 	dec [hl]
 	push bc
 	depixel 12, 13, 0, 4
-	ld a, SPRITE_ANIM_INDEX_SLOTS_EGG
+	ld a, SPRITE_ANIM_OBJ_SLOTS_EGG
 	call InitSpriteAnimStruct
 	pop bc
 	ret

engine/gfx/mon_icons.asm

@@ -137,7 +137,7 @@ InitPartyMenuIcon:
 ; x coord
 	ld e, $10
 ; type is partymon icon
-	ld a, SPRITE_ANIM_INDEX_PARTY_MON
+	ld a, SPRITE_ANIM_OBJ_PARTY_MON
 	call _InitSpriteAnimStruct
 	pop af
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
@@ -184,11 +184,11 @@ NamingScreen_InitAnimatedMonIcon:
 	xor a
 	call GetIconGFX
 	depixel 4, 4, 4, 0
-	ld a, SPRITE_ANIM_INDEX_PARTY_MON
+	ld a, SPRITE_ANIM_OBJ_PARTY_MON
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_NULL
+	ld [hl], SPRITE_ANIM_FUNC_NULL
 	ret
 
 MoveList_InitAnimatedMonIcon:
@@ -199,11 +199,11 @@ MoveList_InitAnimatedMonIcon:
 	call GetIconGFX
 	ld d, 3 * TILE_WIDTH + 2 ; depixel 3, 4, 2, 4
 	ld e, 4 * TILE_WIDTH + 4
-	ld a, SPRITE_ANIM_INDEX_PARTY_MON
+	ld a, SPRITE_ANIM_OBJ_PARTY_MON
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_NULL
+	ld [hl], SPRITE_ANIM_FUNC_NULL
 	ret
 
 Trade_LoadMonIconGFX:
@@ -323,11 +323,11 @@ FreezeMonIcons:
 	jr z, .next
 	cp d
 	jr z, .loadwithtwo
-	ld a, SPRITE_ANIM_SEQ_NULL
+	ld a, SPRITE_ANIM_FUNC_NULL
 	jr .ok
 
 .loadwithtwo
-	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
+	ld a, SPRITE_ANIM_FUNC_PARTY_MON_SWITCH
 
 .ok
 	push hl
@@ -357,7 +357,7 @@ UnfreezeMonIcons:
 	ld b, h
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_PARTY_MON
+	ld [hl], SPRITE_ANIM_FUNC_PARTY_MON
 	pop hl
 .next
 	ld bc, $10
@@ -377,11 +377,11 @@ HoldSwitchmonIcon:
 	jr z, .next
 	cp d
 	jr z, .is_switchmon
-	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SELECTED
+	ld a, SPRITE_ANIM_FUNC_PARTY_MON_SELECTED
 	jr .join_back
 
 .is_switchmon
-	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
+	ld a, SPRITE_ANIM_FUNC_PARTY_MON_SWITCH
 .join_back
 	push hl
 	ld c, l

engine/menus/level_selection_menu.asm

@@ -240,7 +240,7 @@ LevelSelectionMenu_InitPlayerSprite:
 	push af
 	depixel 0, 0
 ; all the SPRITE_ANIM_* related to the level selection menu are sorted by direction, then by gender
-	ld b, SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_DOWN
+	ld b, SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_DOWN
 	ld a, [wPlayerGender]
 	add b
 	call InitSpriteAnimStruct
@@ -343,7 +343,7 @@ LevelSelectionMenu_SetAnimSeqAndFrameset:
 	ld bc, wSpriteAnim1
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld a, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN
+	ld a, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN
 	add e ; add direction
 	ld [hl], a
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
@@ -361,7 +361,7 @@ LevelSelectionMenu_DoPageChangeEvent:
 	ld de, .Events
 	ld bc, wSpriteAnim1
 .loop
-	ld a, [de] ; SPRITE_ANIM_SEQ_* or $00 table terminator
+	ld a, [de] ; SPRITE_ANIM_FUNC_* or $00 table terminator
 	and a
 	ret z
 	inc de
@@ -424,16 +424,16 @@ DEF PAGE_EDGE_LEFT  EQU $08
 DEF PAGE_EDGE_RIGHT EQU $a8
 
 MACRO page_change_event
-; SPRITE_ANIM_SEQ_* to match, Match object's X or Y, X/Y coordinate, Action if both SPRITE_ANIM_SEQ_* and X/Y match
+; SPRITE_ANIM_FUNC_* to match, Match object's X or Y, X/Y coordinate, Action if both SPRITE_ANIM_FUNC_* and X/Y match
 	db \1, \2, \3
 	dw \4
 ENDM
 
 .Events:
-	page_change_event SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN,  SPRITEANIMSTRUCT_YCOORD, PAGE_EDGE_DOWN,  .PageChangeDown
-	page_change_event SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_UP,    SPRITEANIMSTRUCT_YCOORD, PAGE_EDGE_UP,    .PageChangeUp
-	page_change_event SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_LEFT,  SPRITEANIMSTRUCT_XCOORD, PAGE_EDGE_LEFT,  .PageChangeLeft
-	page_change_event SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITEANIMSTRUCT_XCOORD, PAGE_EDGE_RIGHT, .PageChangeRight
+	page_change_event SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN,  SPRITEANIMSTRUCT_YCOORD, PAGE_EDGE_DOWN,  .PageChangeDown
+	page_change_event SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP,    SPRITEANIMSTRUCT_YCOORD, PAGE_EDGE_UP,    .PageChangeUp
+	page_change_event SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT,  SPRITEANIMSTRUCT_XCOORD, PAGE_EDGE_LEFT,  .PageChangeLeft
+	page_change_event SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITEANIMSTRUCT_XCOORD, PAGE_EDGE_RIGHT, .PageChangeRight
 	db $0
 
 .PageChangeDown:
@@ -675,7 +675,7 @@ LevelSelectionMenu_Delay10Frames:
 	ret
 
 _LevelSelectionMenuHandleTransition:
-; Called from the corresponding SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_* animation sequence.
+; Called from the corresponding SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_* animation sequence.
 ; This function is here because LevelSelectionMenu_LandmarkTransitions is in this bank.
 ; Applies the animation to the player sprite for the current frame.
 	ld hl, wLevelSelectionMenuLandmarkTransitionsPointer
@@ -748,7 +748,7 @@ _LevelSelectionMenuHandleTransition:
 ; make the player sprite face down as the default state
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld a, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN
+	ld a, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN
 	ld [hl], a
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc

engine/menus/naming_screen.asm

@@ -166,7 +166,7 @@ NamingScreen:
 	ld [hli], a
 	ld [hl], a
 	depixel 4, 4, 4, 0
-	ld a, SPRITE_ANIM_INDEX_RED_WALK
+	ld a, SPRITE_ANIM_OBJ_RED_WALK
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -198,14 +198,14 @@ NamingScreen:
 	ld [hli], a
 	ld [hl], a
 	pop de
-	ld b, SPRITE_ANIM_INDEX_RED_WALK
+	ld b, SPRITE_ANIM_OBJ_RED_WALK
 	ld a, d
 	cp HIGH(KrisSpriteGFX)
 	jr nz, .not_kris
 	ld a, e
 	cp LOW(KrisSpriteGFX)
 	jr nz, .not_kris
-	ld b, SPRITE_ANIM_INDEX_BLUE_WALK
+	ld b, SPRITE_ANIM_OBJ_BLUE_WALK
 .not_kris
 	ld a, b
 	depixel 4, 4, 4, 0
@@ -367,7 +367,7 @@ NamingScreenJoypadLoop:
 	jr nz, .got_cursor_position
 	ld d, 8 * TILE_WIDTH
 .got_cursor_position
-	ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
+	ld a, SPRITE_ANIM_OBJ_NAMING_SCREEN_CURSOR
 	call InitSpriteAnimStruct
 	ld a, c
 	ld [wNamingScreenCursorObjectPointer], a
@@ -917,7 +917,7 @@ _ComposeMailMessage:
 
 	; init mail icon
 	depixel 3, 2
-	ld a, SPRITE_ANIM_INDEX_PARTY_MON
+	ld a, SPRITE_ANIM_OBJ_PARTY_MON
 	call InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
@@ -1033,7 +1033,7 @@ INCBIN "gfx/naming_screen/mail.2bpp"
 
 .init_blinking_cursor
 	depixel 9, 2
-	ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	ld a, SPRITE_ANIM_OBJ_COMPOSE_MAIL_CURSOR
 	call InitSpriteAnimStruct
 	ld a, c
 	ld [wNamingScreenCursorObjectPointer], a

engine/movie/evolution_animation.asm

@@ -311,7 +311,7 @@ EvolutionAnimation:
 .GenerateBallOfLight:
 	push de
 	depixel 9, 11
-	ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
+	ld a, SPRITE_ANIM_OBJ_EVOLUTION_BALL_OF_LIGHT
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc

engine/movie/intro.asm

@@ -388,7 +388,7 @@ IntroScene7:
 	call Intro_ResetLYOverrides
 	farcall ClearSpriteAnims
 	depixel 13, 27, 4, 0
-	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
+	ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE
 	call InitSpriteAnimStruct
 	ld a, $f0
 	ld [wGlobalAnimXOffset], a
@@ -481,7 +481,7 @@ IntroScene10:
 
 .pichu
 	depixel 21, 16, 1, 0
-	ld a, SPRITE_ANIM_INDEX_INTRO_PICHU
+	ld a, SPRITE_ANIM_OBJ_INTRO_PICHU
 	call InitSpriteAnimStruct
 	ld de, SFX_INTRO_PICHU
 	call PlaySFX
@@ -489,7 +489,7 @@ IntroScene10:
 
 .wooper
 	depixel 22, 6
-	ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER
+	ld a, SPRITE_ANIM_OBJ_INTRO_WOOPER
 	call InitSpriteAnimStruct
 	ld de, SFX_INTRO_PICHU
 	call PlaySFX
@@ -668,7 +668,7 @@ IntroScene13:
 	ldh [hWY], a
 	farcall ClearSpriteAnims
 	depixel 13, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
+	ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE
 	call InitSpriteAnimStruct
 	ld de, MUSIC_CRYSTAL_OPENING
 	call PlayMusic
@@ -779,10 +779,10 @@ IntroScene15:
 	farcall ClearSpriteAnims
 	call Intro_SetCGBPalUpdate
 	depixel 8, 5
-	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
+	ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN_F
 	call InitSpriteAnimStruct
 	depixel 12, 0
-	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
+	ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY
 	call InitSpriteAnimStruct
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -931,7 +931,7 @@ IntroScene19:
 	ld [hl], $7f
 	call Intro_SetCGBPalUpdate
 	depixel 12, 0
-	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
+	ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY
 	call InitSpriteAnimStruct
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -1189,7 +1189,7 @@ INCLUDE "gfx/intro/fade.pal"
 
 CrystalIntro_InitUnownAnim:
 	push de
-	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
+	ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
@@ -1199,7 +1199,7 @@ CrystalIntro_InitUnownAnim:
 	pop de
 
 	push de
-	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
+	ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
@@ -1209,7 +1209,7 @@ CrystalIntro_InitUnownAnim:
 	pop de
 
 	push de
-	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
+	ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
@@ -1218,7 +1218,7 @@ CrystalIntro_InitUnownAnim:
 	call ReinitSpriteAnimFrame
 	pop de
 
-	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
+	ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc

engine/movie/splash.asm

@@ -89,7 +89,7 @@ GameFreakPresentsInit:
 
 	farcall ClearSpriteAnims
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	ld a, SPRITE_ANIM_OBJ_GAMEFREAK_LOGO
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc

engine/movie/trade_animation.asm

@@ -354,7 +354,7 @@ TradeAnim_InitTubeAnim:
 	call LoadTradeBubbleGFX
 
 	pop de
-	ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON
+	ld a, SPRITE_ANIM_OBJ_TRADEMON_ICON
 	call InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -363,7 +363,7 @@ TradeAnim_InitTubeAnim:
 	ld [hl], b
 
 	pop de
-	ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
+	ld a, SPRITE_ANIM_OBJ_TRADEMON_BUBBLE
 	call InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -1007,7 +1007,7 @@ TrademonStats_PrintTrademonID:
 
 TradeAnim_RockingBall:
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	ld a, SPRITE_ANIM_OBJ_TRADE_POKE_BALL
 	call InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, 32
@@ -1016,7 +1016,7 @@ TradeAnim_RockingBall:
 
 TradeAnim_DropBall:
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	ld a, SPRITE_ANIM_OBJ_TRADE_POKE_BALL
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
@@ -1031,7 +1031,7 @@ TradeAnim_DropBall:
 
 TradeAnim_Poof:
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_TRADE_POOF
+	ld a, SPRITE_ANIM_OBJ_TRADE_POOF
 	call InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, 16
@@ -1044,7 +1044,7 @@ TradeAnim_BulgeThroughTube:
 	ld a, %11100100 ; 3,2,1,0
 	call DmgToCgbObjPal0
 	depixel 5, 11
-	ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
+	ld a, SPRITE_ANIM_OBJ_TRADE_TUBE_BULGE
 	call InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, 64

engine/pokegear/pokegear.asm

@@ -150,7 +150,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
 
 InitPokegearModeIndicatorArrow:
 	depixel 4, 2, 4, 0
-	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
+	ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -560,11 +560,11 @@ PokegearMap_ContinueMap:
 PokegearMap_InitPlayerIcon:
 	push af
 	depixel 0, 0
-	ld b, SPRITE_ANIM_INDEX_RED_WALK
+	ld b, SPRITE_ANIM_OBJ_RED_WALK
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
-	ld b, SPRITE_ANIM_INDEX_BLUE_WALK
+	ld b, SPRITE_ANIM_OBJ_BLUE_WALK
 .got_gender
 	ld a, b
 	call InitSpriteAnimStruct
@@ -587,14 +587,14 @@ PokegearMap_InitPlayerIcon:
 PokegearMap_InitCursor:
 	push af
 	depixel 0, 0
-	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
+	ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $04
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_NULL
+	ld [hl], SPRITE_ANIM_FUNC_NULL
 	pop af
 	push bc
 	call PokegearMap_UpdateCursorPosition
@@ -632,7 +632,7 @@ PokegearMap_UpdateCursorPosition:
 PokegearRadio_Init:
 	call InitPokegearTilemap
 	depixel 4, 10, 4, 4
-	ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
+	ld a, SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -2429,14 +2429,14 @@ TownMapMon:
 	farcall GetSpeciesIcon
 ; Animation/palette
 	depixel 0, 0
-	ld a, SPRITE_ANIM_INDEX_PARTY_MON
+	ld a, SPRITE_ANIM_OBJ_PARTY_MON
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $08
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_NULL
+	ld [hl], SPRITE_ANIM_FUNC_NULL
 	ret
 
 TownMapPlayerIcon:
@@ -2458,11 +2458,11 @@ TownMapPlayerIcon:
 	call Request2bpp
 ; Animation/palette
 	depixel 0, 0
-	ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
+	ld b, SPRITE_ANIM_OBJ_RED_WALK ; Male
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
-	ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
+	ld b, SPRITE_ANIM_OBJ_BLUE_WALK ; Female
 .got_gender
 	ld a, b
 	call InitSpriteAnimStruct

engine/pokemon/breeding.asm

@@ -652,7 +652,7 @@ Hatch_UpdateFrontpicBGMapCenter:
 	call SetPalettes
 	jp WaitBGMap
 
-EggHatch_DoAnimFrame:
+EggHatch_DoSpriteAnimFrame:
 	push hl
 	push de
 	push bc
@@ -711,14 +711,14 @@ EggHatch_AnimationSequence:
 	ldh [hSCX], a
 	ld a, -2
 	ld [wGlobalAnimXOffset], a
-	call EggHatch_DoAnimFrame
+	call EggHatch_DoSpriteAnimFrame
 	ld c, 2
 	call DelayFrames
 	ld a, -2
 	ldh [hSCX], a
 	ld a, 2
 	ld [wGlobalAnimXOffset], a
-	call EggHatch_DoAnimFrame
+	call EggHatch_DoSpriteAnimFrame
 	ld c, 2
 	call DelayFrames
 	dec e
@@ -772,7 +772,7 @@ EggHatch_CrackShell:
 	add 9 * TILE_WIDTH + 4
 	ld d, a
 	ld e, 11 * TILE_WIDTH
-	ld a, SPRITE_ANIM_INDEX_EGG_CRACK
+	ld a, SPRITE_ANIM_OBJ_EGG_CRACK
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -800,7 +800,7 @@ Hatch_InitShellFragments:
 	push hl
 	push bc
 
-	ld a, SPRITE_ANIM_INDEX_EGG_HATCH
+	ld a, SPRITE_ANIM_OBJ_EGG_HATCH
 	call InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
@@ -823,7 +823,7 @@ Hatch_InitShellFragments:
 .done
 	ld de, SFX_EGG_HATCH
 	call PlaySFX
-	call EggHatch_DoAnimFrame
+	call EggHatch_DoSpriteAnimFrame
 	ret
 
 MACRO shell_fragment
@@ -847,7 +847,7 @@ ENDM
 Hatch_ShellFragmentLoop:
 	ld c, 129
 .loop
-	call EggHatch_DoAnimFrame
+	call EggHatch_DoSpriteAnimFrame
 	dec c
 	jr nz, .loop
 	ret

engine/sprite_anims/core.asm

@@ -43,7 +43,7 @@ DoNextFrameForAllSprites:
 	ld b, h
 	push hl
 	push de
-	call DoAnimFrame ; Uses a massive dw
+	call DoSpriteAnimFrame ; Uses a massive dw
 	call UpdateAnimFrame
 	pop de
 	pop hl
@@ -87,7 +87,7 @@ DoNextFrameForFirst16Sprites:
 	ld b, h
 	push hl
 	push de
-	call DoAnimFrame ; Uses a massive dw
+	call DoSpriteAnimFrame ; Uses a massive dw
 	call UpdateAnimFrame
 	pop de
 	pop hl
@@ -150,11 +150,11 @@ _InitSpriteAnimStruct::
 	inc [hl]
 .nonzero
 
-; Get row a of SpriteAnimSeqData, copy the pointer into de
+; Get row a of SpriteAnimObjects, copy the pointer into de
 	pop af
 	ld e, a
 	ld d, 0
-	ld hl, SpriteAnimSeqData
+	ld hl, SpriteAnimObjects
 	add hl, de
 	add hl, de
 	add hl, de
@@ -531,9 +531,9 @@ UnusedLoadSpriteAnimGFX: ; unreferenced
 	pop bc
 	ret
 
-INCLUDE "data/sprite_anims/sequences.asm"
+INCLUDE "data/sprite_anims/objects.asm"
 
-INCLUDE "engine/gfx/sprite_anims.asm"
+INCLUDE "engine/sprite_anims/functions.asm"
 
 INCLUDE "data/sprite_anims/framesets.asm"
 

engine/sprite_anims/functions.asm

@@ -1,4 +1,4 @@
-DoAnimFrame:
+DoSpriteAnimFrame:
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
 	ld e, [hl]
@@ -12,59 +12,59 @@ DoAnimFrame:
 	jp hl
 
 .Jumptable:
-; entries correspond to SPRITE_ANIM_SEQ_* constants (see constants/sprite_anim_constants.asm)
-	table_width 2, DoAnimFrame.Jumptable
-	dw AnimSeq_Null
-	dw AnimSeq_PartyMon
-	dw AnimSeq_PartyMonSwitch
-	dw AnimSeq_PartyMonSelected
-	dw AnimSeq_GSTitleTrail
-	dw AnimSeq_NamingScreenCursor
-	dw AnimSeq_GameFreakLogo
-	dw AnimSeq_GSGameFreakLogoStar
-	dw AnimSeq_GSGameFreakLogoSparkle
-	dw AnimSeq_SlotsGolem
-	dw AnimSeq_SlotsChansey
-	dw AnimSeq_SlotsChanseyEgg
-	dw AnimSeq_MailCursor
-	dw AnimSeq_UnusedCursor
-	dw AnimSeq_MemoryGameCursor
-	dw AnimSeq_PokegearArrow
-	dw AnimSeq_TradePokeBall
-	dw AnimSeq_TradeTubeBulge
-	dw AnimSeq_TrademonInTube
-	dw AnimSeq_RevealNewMon
-	dw AnimSeq_RadioTuningKnob
-	dw AnimSeq_CutLeaves
-	dw AnimSeq_FlyFrom
-	dw AnimSeq_FlyLeaf
-	dw AnimSeq_FlyTo
-	dw AnimSeq_GSIntroHoOhLugia
-	dw AnimSeq_EZChatCursor
-	dw AnimSeq_MobileTradeSentPulse
-	dw AnimSeq_MobileTradeOTPulse
-	dw AnimSeq_IntroSuicune
-	dw AnimSeq_IntroPichuWooper
-	dw AnimSeq_Celebi
-	dw AnimSeq_IntroUnown
-	dw AnimSeq_IntroUnownF
-	dw AnimSeq_IntroSuicuneAway
-	dw AnimSeq_LevelSelectionMenuWalkDown
-	dw AnimSeq_LevelSelectionMenuWalkUp
-	dw AnimSeq_LevelSelectionMenuWalkLeft
-	dw AnimSeq_LevelSelectionMenuWalkRight
-	assert_table_length NUM_SPRITE_ANIM_SEQS
+; entries correspond to SPRITE_ANIM_FUNC_* constants (see constants/sprite_anim_constants.asm)
+	table_width 2, DoSpriteAnimFrame.Jumptable
+	dw SpriteAnimFunc_Null
+	dw SpriteAnimFunc_PartyMon
+	dw SpriteAnimFunc_PartyMonSwitch
+	dw SpriteAnimFunc_PartyMonSelected
+	dw SpriteAnimFunc_GSTitleTrail
+	dw SpriteAnimFunc_NamingScreenCursor
+	dw SpriteAnimFunc_GameFreakLogo
+	dw SpriteAnimFunc_GSGameFreakLogoStar
+	dw SpriteAnimFunc_GSGameFreakLogoSparkle
+	dw SpriteAnimFunc_SlotsGolem
+	dw SpriteAnimFunc_SlotsChansey
+	dw SpriteAnimFunc_SlotsChanseyEgg
+	dw SpriteAnimFunc_MailCursor
+	dw SpriteAnimFunc_UnusedCursor
+	dw SpriteAnimFunc_MemoryGameCursor
+	dw SpriteAnimFunc_PokegearArrow
+	dw SpriteAnimFunc_TradePokeBall
+	dw SpriteAnimFunc_TradeTubeBulge
+	dw SpriteAnimFunc_TrademonInTube
+	dw SpriteAnimFunc_RevealNewMon
+	dw SpriteAnimFunc_RadioTuningKnob
+	dw SpriteAnimFunc_CutLeaves
+	dw SpriteAnimFunc_FlyFrom
+	dw SpriteAnimFunc_FlyLeaf
+	dw SpriteAnimFunc_FlyTo
+	dw SpriteAnimFunc_GSIntroHoOhLugia
+	dw SpriteAnimFunc_EZChatCursor
+	dw SpriteAnimFunc_MobileTradeSentPulse
+	dw SpriteAnimFunc_MobileTradeOTPulse
+	dw SpriteAnimFunc_IntroSuicune
+	dw SpriteAnimFunc_IntroPichuWooper
+	dw SpriteAnimFunc_Celebi
+	dw SpriteAnimFunc_IntroUnown
+	dw SpriteAnimFunc_IntroUnownF
+	dw SpriteAnimFunc_IntroSuicuneAway
+	dw SpriteAnimFunc_LevelSelectionMenuWalkDown
+	dw SpriteAnimFunc_LevelSelectionMenuWalkUp
+	dw SpriteAnimFunc_LevelSelectionMenuWalkLeft
+	dw SpriteAnimFunc_LevelSelectionMenuWalkRight
+	assert_table_length NUM_SPRITE_ANIM_FUNCS
 
-AnimSeq_Null:
+SpriteAnimFunc_Null:
 	ret
 
-AnimSeq_PartyMon:
+SpriteAnimFunc_PartyMon:
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
 	cp [hl]
-	jr z, AnimSeq_PartyMonSwitch
+	jr z, SpriteAnimFunc_PartyMonSwitch
 
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -75,7 +75,7 @@ AnimSeq_PartyMon:
 	ld [hl], 0
 	ret
 
-AnimSeq_PartyMonSwitch:
+SpriteAnimFunc_PartyMonSwitch:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], 8 * 3
@@ -117,7 +117,7 @@ AnimSeq_PartyMonSwitch:
 	ld [hl], a
 	ret
 
-AnimSeq_PartyMonSelected:
+SpriteAnimFunc_PartyMonSelected:
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -136,7 +136,7 @@ AnimSeq_PartyMonSelected:
 	ld [hl], 8 * 3
 	ret
 
-AnimSeq_GSTitleTrail:
+SpriteAnimFunc_GSTitleTrail:
 	call AnimSeqs_AnonJumptable
 	jp hl
 .anon_dw
@@ -203,7 +203,7 @@ AnimSeq_GSTitleTrail:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_GSIntroHoOhLugia:
+SpriteAnimFunc_GSIntroHoOhLugia:
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
@@ -217,19 +217,19 @@ AnimSeq_GSIntroHoOhLugia:
 	ld [hl], a
 	ret
 
-AnimSeq_NamingScreenCursor:
+SpriteAnimFunc_NamingScreenCursor:
 	callfar NamingScreen_AnimateCursor
 	ret
 
-AnimSeq_MailCursor:
+SpriteAnimFunc_MailCursor:
 	callfar ComposeMail_AnimateCursor
 	ret
 
-AnimSeq_GameFreakLogo:
+SpriteAnimFunc_GameFreakLogo:
 	callfar GameFreakLogoSpriteAnim
 	ret
 
-AnimSeq_GSGameFreakLogoStar:
+SpriteAnimFunc_GSGameFreakLogoStar:
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
@@ -280,7 +280,7 @@ AnimSeq_GSGameFreakLogoStar:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_GSGameFreakLogoSparkle:
+SpriteAnimFunc_GSGameFreakLogoSparkle:
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
@@ -357,11 +357,11 @@ AnimSeq_GSGameFreakLogoSparkle:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_SlotsGolem:
+SpriteAnimFunc_SlotsGolem:
 	callfar Slots_AnimateGolem
 	ret
 
-AnimSeq_SlotsChansey:
+SpriteAnimFunc_SlotsChansey:
 	callfar Slots_AnimateChansey
 	ld hl, wSlotsDelay
 	ld a, [hl]
@@ -372,7 +372,7 @@ AnimSeq_SlotsChansey:
 	call _ReinitSpriteAnimFrame
 	ret
 
-AnimSeq_SlotsChanseyEgg:
+SpriteAnimFunc_SlotsChanseyEgg:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -405,19 +405,19 @@ AnimSeq_SlotsChanseyEgg:
 	ld [hl], a
 	ret
 
-AnimSeq_UnusedCursor:
+SpriteAnimFunc_UnusedCursor:
 	callfar UnusedCursor_InterpretJoypad_AnimateCursor
 	ret
 
-AnimSeq_PokegearArrow:
+SpriteAnimFunc_PokegearArrow:
 	callfar AnimatePokegearModeIndicatorArrow
 	ret
 
-AnimSeq_MemoryGameCursor:
+SpriteAnimFunc_MemoryGameCursor:
 	callfar MemoryGame_InterpretJoypad_AnimateCursor
 	ret
 
-AnimSeq_TradePokeBall:
+SpriteAnimFunc_TradePokeBall:
 	call AnimSeqs_AnonJumptable
 	jp hl
 .anon_dw
@@ -541,7 +541,7 @@ AnimSeq_TradePokeBall:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_TradeTubeBulge:
+SpriteAnimFunc_TradeTubeBulge:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -559,11 +559,11 @@ AnimSeq_TradeTubeBulge:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_TrademonInTube:
+SpriteAnimFunc_TrademonInTube:
 	callfar TradeAnim_AnimateTrademonInTube
 	ret
 
-AnimSeq_RevealNewMon:
+SpriteAnimFunc_RevealNewMon:
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
@@ -600,11 +600,11 @@ AnimSeq_RevealNewMon:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_RadioTuningKnob:
+SpriteAnimFunc_RadioTuningKnob:
 	callfar AnimateTuningKnob
 	ret
 
-AnimSeq_CutLeaves:
+SpriteAnimFunc_CutLeaves:
 	ld hl, SPRITEANIMSTRUCT_VAR2
 	add hl, bc
 	ld e, [hl]
@@ -643,7 +643,7 @@ AnimSeq_CutLeaves:
 	ld [hl], a
 	ret
 
-AnimSeq_FlyFrom:
+SpriteAnimFunc_FlyFrom:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -682,7 +682,7 @@ AnimSeq_FlyFrom:
 	ld [hl], a
 	ret
 
-AnimSeq_FlyLeaf:
+SpriteAnimFunc_FlyLeaf:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -711,7 +711,7 @@ AnimSeq_FlyLeaf:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_FlyTo:
+SpriteAnimFunc_FlyTo:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -743,13 +743,13 @@ AnimSeq_FlyTo:
 	ld [hl], a
 	ret
 
-AnimSeq_MobileTradeSentPulse:
+SpriteAnimFunc_MobileTradeSentPulse:
 	ret
 
-AnimSeq_MobileTradeOTPulse:
+SpriteAnimFunc_MobileTradeOTPulse:
 	ret
 
-AnimSeq_IntroSuicune:
+SpriteAnimFunc_IntroSuicune:
 	ld a, [wIntroSceneTimer]
 	and a
 	jr nz, .continue
@@ -777,7 +777,7 @@ AnimSeq_IntroSuicune:
 	call _ReinitSpriteAnimFrame
 	ret
 
-AnimSeq_IntroPichuWooper:
+SpriteAnimFunc_IntroPichuWooper:
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
@@ -796,7 +796,7 @@ AnimSeq_IntroPichuWooper:
 .done
 	ret
 
-AnimSeq_IntroUnown:
+SpriteAnimFunc_IntroUnown:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld d, [hl]
@@ -822,7 +822,7 @@ AnimSeq_IntroUnown:
 	ld [hl], a
 	ret
 
-AnimSeq_IntroUnownF:
+SpriteAnimFunc_IntroUnownF:
 	ld a, [wSlotsDelay]
 	cp $40
 	ret nz
@@ -830,7 +830,7 @@ AnimSeq_IntroUnownF:
 	call _ReinitSpriteAnimFrame
 	ret
 
-AnimSeq_IntroSuicuneAway:
+SpriteAnimFunc_IntroSuicuneAway:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -838,14 +838,14 @@ AnimSeq_IntroSuicuneAway:
 	ld [hl], a
 	ret
 
-AnimSeq_EZChatCursor:
+SpriteAnimFunc_EZChatCursor:
 	ret
 
-AnimSeq_Celebi:
+SpriteAnimFunc_Celebi:
 	farcall UpdateCelebiPosition
 	ret
 
-AnimSeq_LevelSelectionMenuWalkDown:
+SpriteAnimFunc_LevelSelectionMenuWalkDown:
 	call LevelSelectionMenuHandleTransition
 	ret nc
 	ld hl, SPRITEANIMSTRUCT_YCOORD
@@ -853,7 +853,7 @@ AnimSeq_LevelSelectionMenuWalkDown:
 	inc [hl]
 	ret
 
-AnimSeq_LevelSelectionMenuWalkUp:
+SpriteAnimFunc_LevelSelectionMenuWalkUp:
 	call LevelSelectionMenuHandleTransition
 	ret nc
 	ld hl, SPRITEANIMSTRUCT_YCOORD
@@ -861,7 +861,7 @@ AnimSeq_LevelSelectionMenuWalkUp:
 	dec [hl]
 	ret
 
-AnimSeq_LevelSelectionMenuWalkLeft:
+SpriteAnimFunc_LevelSelectionMenuWalkLeft:
 	call LevelSelectionMenuHandleTransition
 	ret nc
 	ld hl, SPRITEANIMSTRUCT_XCOORD
@@ -869,7 +869,7 @@ AnimSeq_LevelSelectionMenuWalkLeft:
 	dec [hl]
 	ret
 
-AnimSeq_LevelSelectionMenuWalkRight:
+SpriteAnimFunc_LevelSelectionMenuWalkRight:
 	call LevelSelectionMenuHandleTransition
 	ret nc
 	ld hl, SPRITEANIMSTRUCT_XCOORD