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 14:51:59 +0200 |
| commit | 0a1eb668d053c9904a5bb8f41dda5f0d1bef21d8 (patch) | |
| tree | 3852f0ea1a78602e3a2c55649259cae8e7e0156d /engine/games | |
| parent | a7c294371c6514bd6a9fbfa4d2d4a0bb6b12b3a5 (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/games')
| -rw-r--r-- | engine/games/dummy_game.asm | 10 | ||||
| -rw-r--r-- | engine/games/slot_machine.asm | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 2fe4c1ce..55c74407 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -523,7 +523,7 @@ DummyGame_InterpretJoypad_AnimateCursor: ret .pressed_a - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] inc a @@ -538,7 +538,7 @@ DummyGame_InterpretJoypad_AnimateCursor: ret z sub 1 tiles ld [hl], a - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc dec [hl] ret @@ -551,7 +551,7 @@ DummyGame_InterpretJoypad_AnimateCursor: ret z add 1 tiles ld [hl], a - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc inc [hl] ret @@ -564,7 +564,7 @@ DummyGame_InterpretJoypad_AnimateCursor: ret z sub 1 tiles ld [hl], a - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] sub 9 @@ -579,7 +579,7 @@ DummyGame_InterpretJoypad_AnimateCursor: ret z add 1 tiles ld [hl], a - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] add 9 diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index b4935b2e..df34a7de 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1139,7 +1139,7 @@ ReelAction_InitGolem: depixel 12, 13 ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM call InitSpriteAnimStruct - ld hl, SPRITEANIMSTRUCT_0E + ld hl, SPRITEANIMSTRUCT_VAR3 add hl, bc pop af ld [hl], a @@ -1962,7 +1962,7 @@ Slots_AnimateGolem: dw .roll .init - ld hl, SPRITEANIMSTRUCT_0E + ld hl, SPRITEANIMSTRUCT_VAR3 add hl, bc ld a, [hl] and a @@ -1979,7 +1979,7 @@ Slots_AnimateGolem: ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc inc [hl] - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld [hl], $30 ld hl, SPRITEANIMSTRUCT_XOFFSET @@ -1987,7 +1987,7 @@ Slots_AnimateGolem: ld [hl], $0 .fall - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] cp $20 @@ -2006,7 +2006,7 @@ Slots_AnimateGolem: ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc inc [hl] - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld [hl], $2 ld a, 1 @@ -2025,7 +2025,7 @@ Slots_AnimateGolem: jr nc, .restart and $3 ret nz - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] xor $ff @@ -2095,11 +2095,11 @@ Slots_AnimateChansey: ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc inc [hl] - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld [hl], $8 .two - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] and a |