summaryrefslogtreecommitdiff
path: root/engine/battle_anims/core.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-08-22 16:22:37 +0200
committermid-kid <esteve.varela@gmail.com>2020-08-27 13:59:33 +0200
commit13c4a93ceae759f1fd5f46b326afb83e4f44aeee (patch)
treeaa9d67cc69744580d42cadf856fd2ddf993939b6 /engine/battle_anims/core.asm
parent733664b18fc2db7cc1d68a818335900565230ac9 (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 'engine/battle_anims/core.asm')
-rw-r--r--engine/battle_anims/core.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index fcde1be6b..37dfce599 100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -39,42 +39,42 @@ endr
ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld a, [wLastAnimObjectIndex]
- ld [hli], a ; Index
+ ld [hli], a ; BATTLEANIMSTRUCT_INDEX
ld a, [de]
inc de
- ld [hli], a ; 01
+ ld [hli], a ; BATTLEANIMSTRUCT_OAMFLAGS
ld a, [de]
inc de
- ld [hli], a ; 02
+ ld [hli], a ; BATTLEANIMSTRUCT_02
ld a, [de]
inc de
- ld [hli], a ; Frameset ID
+ ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID
ld a, [de]
inc de
- ld [hli], a ; Function
+ ld [hli], a ; BATTLEANIMSTRUCT_FUNCTION
ld a, [de]
inc de
- ld [hli], a ; 05
+ ld [hli], a ; BATTLEANIMSTRUCT_PALETTE
ld a, [de]
call GetBattleAnimTileOffset
- ld [hli], a ; Tile ID
+ ld [hli], a ; BATTLEANIMSTRUCT_TILEID
ld a, [wBattleObjectTempXCoord]
- ld [hli], a ; X Coord
+ ld [hli], a ; BATTLEANIMSTRUCT_XCOORD
ld a, [wBattleObjectTempYCoord]
- ld [hli], a ; Y Coord
+ ld [hli], a ; BATTLEANIMSTRUCT_YCOORD
xor a
- ld [hli], a ; X Offset
- ld [hli], a ; Y Offset
+ ld [hli], a ; BATTLEANIMSTRUCT_XOFFSET
+ ld [hli], a ; BATTLEANIMSTRUCT_YOFFSET
ld a, [wBattleObjectTempParam]
- ld [hli], a ; Param
+ ld [hli], a ; BATTLEANIMSTRUCT_PARAM
xor a
- ld [hli], a ; 0c
+ ld [hli], a ; BATTLEANIMSTRUCT_DURATION
dec a
- ld [hli], a ; 0d
+ ld [hli], a ; BATTLEANIMSTRUCT_FRAME
xor a
- ld [hli], a ; 0e
- ld [hli], a ; 0f
- ld [hl], a ; 10
+ ld [hli], a ; BATTLEANIMSTRUCT_JUMPTABLE_INDEX
+ ld [hli], a ; BATTLEANIMSTRUCT_VAR1
+ ld [hl], a ; BATTLEANIMSTRUCT_VAR2
ret
BattleAnimOAMUpdate:
@@ -199,7 +199,7 @@ BattleAnimOAMUpdate:
ret
InitBattleAnimBuffer:
- ld hl, BATTLEANIMSTRUCT_01
+ ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]
@@ -232,7 +232,7 @@ InitBattleAnimBuffer:
and a
ret z
- ld hl, BATTLEANIMSTRUCT_01
+ ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]
ld [wBattleAnimTempOAMFlags], a