Rangi Suggestions part1

pret · Jun 22, 2023 · 9c483d9 · 9c483d9
1 parent 48eb31c
commit 9c483d9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
@@ -218,9 +218,9 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const BATTLE_ANIM_INDEX_PLAYERHEAD_1ROW
 	const BATTLE_ANIM_INDEX_ENEMYFEET_2ROW
 	const BATTLE_ANIM_INDEX_PLAYERHEAD_2ROW
-DEF NUM_ANIM_OBJS EQU const_value
+DEF NUM_BATTLE_ANIM_INDEXES EQU const_value
 
-; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)
+; DoBattleAnimFrame.Jumptable indexes (see engine/battle_anims/functions.asm)
 	const_def
 	const BATTLE_ANIM_SEQ_NULL
 	const BATTLE_ANIM_SEQ_USER_TO_TARGET
@@ -491,7 +491,7 @@ DEF NUM_BATTLEANIMFUNCS EQU const_value
 	const BATTLE_ANIM_FRAMESET_B6
 	const BATTLE_ANIM_FRAMESET_B7
 	const BATTLE_ANIM_FRAMESET_B8
-DEF NUM_BATTLEANIMFRAMESETS EQU const_value
+DEF NUM_BATTLE_ANIM_FRAMESETS EQU const_value
 
 ; BattleAnimOAMData indexes (see data/battle_anims/oam.asm)
 	const_def

diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
@@ -186,7 +186,7 @@ BattleAnimFrameData:
 	dw .Frameset_b6 ; BATTLE_ANIM_FRAMESET_B6
 	dw .Frameset_b7 ; BATTLE_ANIM_FRAMESET_B7
 	dw .Frameset_b8 ; BATTLE_ANIM_FRAMESET_B8
-	assert_table_length NUM_BATTLEANIMFRAMESETS
+	assert_table_length NUM_BATTLE_ANIM_FRAMESETS
 
 .Frameset_00:
 	oamframe BATTLE_ANIM_OAMSET_00,  6

diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm
@@ -395,4 +395,4 @@ BattleAnimObjects:
 	battleanimobj ABSOLUTE_X, $00, BATTLE_ANIM_FRAMESET_B7, BATTLE_ANIM_SEQ_NULL, PAL_BATTLE_OB_ENEMY, ANIM_GFX_PLAYERHEAD
 ; BATTLE_ANIM_INDEX_PLAYERHEAD_2ROW
 	battleanimobj ABSOLUTE_X, $00, BATTLE_ANIM_FRAMESET_B8, BATTLE_ANIM_SEQ_NULL, PAL_BATTLE_OB_PLAYER, ANIM_GFX_ENEMYFEET
-	assert_table_length NUM_ANIM_OBJS
+	assert_table_length NUM_BATTLE_ANIM_INDEXES