summaryrefslogtreecommitdiff
path: root/engine/battle_anims/core.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-27 12:13:44 -0400
committerGitHub <noreply@github.com>2020-08-27 12:13:44 -0400
commita147c35540f4010b495cc1ba990320eeb4af1b35 (patch)
tree0ac1b41908eb1b3b3e358be3afb91fadbf600c9d /engine/battle_anims/core.asm
parentc5a3429314e26c4a26a1a5ddd5fe4d2d59294b71 (diff)
parent3b43f79dc67b0e2d65bacf222d5ef044c0376fde (diff)
Merge pull request #762 from mid-kid/master
Better document splash screen
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