diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-22 16:22:37 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-27 14:51:59 +0200 |
| commit | 0a1eb668d053c9904a5bb8f41dda5f0d1bef21d8 (patch) | |
| tree | 3852f0ea1a78602e3a2c55649259cae8e7e0156d /constants | |
| parent | a7c294371c6514bd6a9fbfa4d2d4a0bb6b12b3a5 (diff) | |
Fix some constants surrounding sprite animations
Also commented the use of the field surrounding the struct
initialization functions.
SPRITEANIMSTRUCT_0C -> SPRITEANIMSTRUCT_VAR1
SPRITEANIMSTRUCT_0D -> SPRITEANIMSTRUCT_VAR2
SPRITEANIMSTRUCT_0E -> SPRITEANIMSTRUCT_VAR3
SPRITEANIMSTRUCT_0F -> SPRITEANIMSTRUCT_VAR4
BATTLEANIMSTRUCT_01 -> BATTLEANIMSTRUCT_OAMFLAGS
BATTLEANIMSTRUCT_ANON_JT_INDEX -> BATTLEANIMSTRUCT_JUMPTABLE_INDEX
BATTLEANIMSTRUCT_0F -> BATTLEANIMSTRUCT_VAR1
BATTLEANIMSTRUCT_10 -> BATTLEANIMSTRUCT_VAR2
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_anim_constants.asm | 8 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 5d3dc5d2..6720c2b6 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -1,7 +1,7 @@ ; battle_anim_struct members (see macros/wram.asm) const_def const BATTLEANIMSTRUCT_INDEX - const BATTLEANIMSTRUCT_01 + const BATTLEANIMSTRUCT_OAMFLAGS const BATTLEANIMSTRUCT_02 const BATTLEANIMSTRUCT_FRAMESET_ID const BATTLEANIMSTRUCT_FUNCTION @@ -14,9 +14,9 @@ const BATTLEANIMSTRUCT_PARAM const BATTLEANIMSTRUCT_DURATION const BATTLEANIMSTRUCT_FRAME - const BATTLEANIMSTRUCT_ANON_JT_INDEX - const BATTLEANIMSTRUCT_0F - const BATTLEANIMSTRUCT_10 + const BATTLEANIMSTRUCT_JUMPTABLE_INDEX + const BATTLEANIMSTRUCT_VAR1 + const BATTLEANIMSTRUCT_VAR2 const_skip 7 BATTLEANIMSTRUCT_LENGTH EQU const_value NUM_ANIM_OBJECTS EQU 10 ; see wActiveAnimObjects diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 9926b19d..9e8639de 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -12,10 +12,10 @@ const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9 const SPRITEANIMSTRUCT_FRAME ; a const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b - const SPRITEANIMSTRUCT_0C ; c - const SPRITEANIMSTRUCT_0D ; d - const SPRITEANIMSTRUCT_0E ; e - const SPRITEANIMSTRUCT_0F ; f + const SPRITEANIMSTRUCT_VAR1 ; c + const SPRITEANIMSTRUCT_VAR2 ; d + const SPRITEANIMSTRUCT_VAR3 ; e + const SPRITEANIMSTRUCT_VAR4 ; f SPRITEANIMSTRUCT_LENGTH EQU const_value NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs |