summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'engine/gfx')
-rw-r--r--engine/gfx/mon_icons.asm2
-rw-r--r--engine/gfx/sprite_anims.asm84
-rw-r--r--engine/gfx/sprites.asm31
3 files changed, 59 insertions, 58 deletions
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index c1666fda4..847eb07f7 100644
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -194,7 +194,7 @@ SetPartyMonIconAnimSpeed:
ld [hl], a
rlca
rlca
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], a
ret
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 6cfe9ba3d..47dd91c96 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -74,7 +74,7 @@ DoAnimFrame:
add hl, bc
ld [hl], 8 * 3
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
ld d, a
@@ -82,7 +82,7 @@ DoAnimFrame:
and $f
ret nz
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld e, [hl]
@@ -145,14 +145,14 @@ DoAnimFrame:
add hl, bc
ld a, [hl]
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
and $3
ld [hl], a
inc [hl]
swap a
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
@@ -163,7 +163,7 @@ DoAnimFrame:
cp $a4
jr nc, .asm_8d356
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
add $4
@@ -175,14 +175,14 @@ DoAnimFrame:
add hl, bc
inc [hl]
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
sla a
sla a
ld d, 2
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
add 3
@@ -199,7 +199,7 @@ DoAnimFrame:
ret
.GSIntroHoOhLugia
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
inc a
@@ -225,7 +225,7 @@ DoAnimFrame:
ret
.GSIntroStar
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
@@ -236,7 +236,7 @@ DoAnimFrame:
and $1f
jr nz, .asm_8d395
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
dec [hl]
.asm_8d395
@@ -258,7 +258,7 @@ DoAnimFrame:
add hl, bc
ld [hl], a
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
@@ -275,13 +275,13 @@ DoAnimFrame:
ret
.GSIntroSparkle
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hli]
or [hl]
jr z, .asm_8d41e
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld d, [hl]
@@ -303,13 +303,13 @@ DoAnimFrame:
add hl, bc
ld [hl], a
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -318,13 +318,13 @@ DoAnimFrame:
ld e, l
ld d, h
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld [hl], e
inc hl
ld [hl], d
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -334,7 +334,7 @@ DoAnimFrame:
ld e, l
ld d, h
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], e
inc hl
@@ -431,13 +431,13 @@ DoAnimFrame:
add hl, bc
ld [hl], $2
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $20
ret
.TradePokeBall_two
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
@@ -448,12 +448,12 @@ DoAnimFrame:
.asm_8d4af
call .IncrementJumptableIndex
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $40
.TradePokeBall_three
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp 48
@@ -477,24 +477,24 @@ DoAnimFrame:
add hl, bc
ld [hl], $4
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $30
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], $24
ret
.TradePokeBall_four
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
jr z, .asm_8d51c
ld d, a
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
call Sprites_Sine
@@ -503,18 +503,18 @@ DoAnimFrame:
add hl, bc
ld [hl], a
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
inc [hl]
ld a, [hl]
and $3f
ret nz
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $20
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
sub $c
@@ -559,7 +559,7 @@ DoAnimFrame:
ret
.RevealNewMon:
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $80
@@ -600,7 +600,7 @@ DoAnimFrame:
ret
.CutLeaves
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld e, [hl]
inc hl
@@ -610,13 +610,13 @@ DoAnimFrame:
ld e, l
ld d, h
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], e
inc hl
ld [hl], d
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
inc [hl]
@@ -645,7 +645,7 @@ DoAnimFrame:
and a
ret z
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
inc [hl]
@@ -657,7 +657,7 @@ DoAnimFrame:
dec [hl]
dec [hl]
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld a, [hl]
ld d, a
@@ -666,7 +666,7 @@ DoAnimFrame:
add $8
ld [hl], a
.skip
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hl]
inc [hl]
@@ -691,7 +691,7 @@ DoAnimFrame:
dec [hl]
ld d, $40
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
inc [hl]
@@ -718,7 +718,7 @@ DoAnimFrame:
inc [hl]
inc [hl]
- ld hl, SPRITEANIMSTRUCT_0F
+ ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld a, [hl]
ld d, a
@@ -727,7 +727,7 @@ DoAnimFrame:
sub $2
ld [hl], a
.asm_8d621
- ld hl, SPRITEANIMSTRUCT_0E
+ ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hl]
inc [hl]
@@ -756,7 +756,7 @@ DoAnimFrame:
add hl, bc
ld [hl], $0
- ld hl, SPRITEANIMSTRUCT_0D
+ ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
add 2
@@ -774,7 +774,7 @@ DoAnimFrame:
ret
.IntroPichuWooper
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp 20
@@ -799,7 +799,7 @@ DoAnimFrame:
inc [hl]
inc [hl]
inc [hl]
- ld hl, SPRITEANIMSTRUCT_0C
+ ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
push af
diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm
index fd87f398b..1de16dbc9 100644
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -160,44 +160,45 @@ _InitSpriteAnimStruct::
add hl, bc
; Load the index.
ld a, [wSpriteAnimCount]
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_INDEX
; Copy the table entry to the next two fields.
ld a, [de]
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_FRAMESET_ID
inc de
ld a, [de]
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_ANIM_SEQ_ID
inc de
; Look up the third field from the table in the wSpriteAnimDict array (10x2).
; Take the value and load it in
ld a, [de]
call GetSpriteAnimVTile
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_TILE_ID
pop de
; Set hl to field 4 (X coordinate). Kinda pointless, because we're presumably already here.
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
; Load the original value of de into here.
ld a, e
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_XCOORD
ld a, d
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_YCOORD
; load 0 into the next four fields
xor a
- ld [hli], a
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_XOFFSET
+ ld [hli], a ; SPRITEANIMSTRUCT_YOFFSET
xor a
- ld [hli], a
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_DURATION
+ ld [hli], a ; SPRITEANIMSTRUCT_DURATIONOFFSET
; load -1 into the next field
dec a
- ld [hli], a
+ ld [hli], a ; SPRITEANIMSTRUCT_FRAME
; load 0 into the last five fields
xor a
-rept 4
- ld [hli], a
-endr
- ld [hl], a
+ ld [hli], a ; SPRITEANIMSTRUCT_JUMPTABLE_INDEX
+ ld [hli], a ; SPRITEANIMSTRUCT_VAR1
+ ld [hli], a ; SPRITEANIMSTRUCT_VAR2
+ ld [hli], a ; SPRITEANIMSTRUCT_VAR3
+ ld [hl], a ; SPRITEANIMSTRUCT_VAR4
; back up the address of the first field to wSpriteAnimAddrBackup
ld a, c
ld [wSpriteAnimAddrBackup], a
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 13:18:52 +0000