summaryrefslogtreecommitdiff
path: root/engine/events
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/events
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/events')
-rw-r--r--engine/events/celebi.asm6
-rw-r--r--engine/events/field_moves.asm6
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 066bdda76..028f2e350 100644
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -22,7 +22,7 @@ CelebiShrineEvent:
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_CELEBI
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld a, $80
ld [hl], a
@@ -138,7 +138,7 @@ UpdateCelebiPosition:
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
inc [hl]
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld a, [hl]
ld d, a
@@ -148,7 +148,7 @@ UpdateCelebiPosition:
sub $3
ld [hl], a
.skip
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hl]
inc [hl]
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index efba9e879..6bbb7cbec 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -222,11 +222,11 @@ Cut_SpawnLeaf:
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], FIELDMOVE_GRASS
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld [hl], $4
pop af
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
pop de
@@ -346,7 +346,7 @@ FlyToAnim:
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_FLY_TO
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld [hl], 11 * 8
ld a, 64