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 13:59:33 +0200 |
commit | 13c4a93ceae759f1fd5f46b326afb83e4f44aeee (patch) | |
tree | aa9d67cc69744580d42cadf856fd2ddf993939b6 /engine/gfx/sprites.asm | |
parent | 733664b18fc2db7cc1d68a818335900565230ac9 (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/gfx/sprites.asm')
-rw-r--r-- | engine/gfx/sprites.asm | 31 |
1 files changed, 16 insertions, 15 deletions
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 |