summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2021-04-21 13:02:49 +0200
committerBad Diode <bd@badd10de.dev>2021-04-21 13:02:49 +0200
commite10a71a8d5c89f8dd01a77e28abcf474061680e6 (patch)
tree8aceced513f1899f1ab9ef0d1288b4260ae380db
parent49d11225615f864b4a6b204219fe40b9d2b9e435 (diff)
downloadgba-experiments-e10a71a8d5c89f8dd01a77e28abcf474061680e6.tar.gz
gba-experiments-e10a71a8d5c89f8dd01a77e28abcf474061680e6.zip
Move frame counter to end of main loop
-rw-r--r--src/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 59bf9d4..831359b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -569,7 +569,7 @@ int main(void) {
569 btn_a.frame = 1; 569 btn_a.frame = 1;
570 } else if (key_pressed(KEY_A) || key_hold(KEY_A)) { 570 } else if (key_pressed(KEY_A) || key_hold(KEY_A)) {
571 // DEBUG: Slowing animation rate. What would be a better solution? 571 // DEBUG: Slowing animation rate. What would be a better solution?
572 if (frame_counter++ % 3 == 0) { 572 if (frame_counter % 3 == 0) {
573 if (btn_a.frame < btn_a.n_frames) { 573 if (btn_a.frame < btn_a.n_frames) {
574 btn_a.frame++; 574 btn_a.frame++;
575 } 575 }
@@ -586,9 +586,9 @@ int main(void) {
586 if (key_pressed(KEY_R)) { 586 if (key_pressed(KEY_R)) {
587 } 587 }
588 588
589 OBJ_ATTR_2(0) = btn_b.tile_index + 16 * btn_b.frame; 589 OBJ_ATTR_2(btn_b.id) = sprites[btn_b.id].tile_start + sprites[btn_b.id].n_tiles * btn_b.frame;
590 OBJ_ATTR_2(1) = btn_a.tile_index + 16 * btn_a.frame; 590 OBJ_ATTR_2(btn_a.id) = sprites[btn_a.id].tile_start + sprites[btn_a.id].n_tiles * btn_a.frame;
591 591 frame_counter++;
592 }; 592 };
593 593
594 return 0; 594 return 0;