diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gba-buttons.c | 15 | ||||
-rw-r--r-- | src/main.c | 12 |
2 files changed, 7 insertions, 20 deletions
diff --git a/src/gba-buttons.c b/src/gba-buttons.c index 7f13676..951b4dc 100644 --- a/src/gba-buttons.c +++ b/src/gba-buttons.c | |||
@@ -140,21 +140,6 @@ typedef struct SpriteAnimation { | |||
140 | 140 | ||
141 | typedef enum {BTN_STATE_IDLE, BTN_STATE_PRESSED, BTN_STATE_RELEASED, BTN_STATE_HOLD} BtnState; | 141 | typedef enum {BTN_STATE_IDLE, BTN_STATE_PRESSED, BTN_STATE_RELEASED, BTN_STATE_HOLD} BtnState; |
142 | 142 | ||
143 | static size_t btn_state_idle[] = {0}; | ||
144 | // static size_t btn_state_pressed[] = {16, 16, 32, 32, 48, 48, 64, 64, 80, 96}; | ||
145 | static size_t btn_state_pressed[] = {0}; | ||
146 | |||
147 | static SpriteAnimation *animation_states[] = { | ||
148 | &(SpriteAnimation){ | ||
149 | .tile_offsets = &btn_state_idle, | ||
150 | .n_frames = sizeof(btn_state_idle) / sizeof(size_t), | ||
151 | }, | ||
152 | &(SpriteAnimation){ | ||
153 | .tile_offsets = &btn_state_pressed, | ||
154 | .n_frames = sizeof(btn_state_pressed) / sizeof(size_t), | ||
155 | }, | ||
156 | }; | ||
157 | |||
158 | typedef struct AnimationEntry { | 143 | typedef struct AnimationEntry { |
159 | int x_offset; | 144 | int x_offset; |
160 | int y_offset; | 145 | int y_offset; |
@@ -1,3 +1,5 @@ | |||
1 | #include <string.h> | ||
2 | |||
1 | #include "shorthand.h" | 3 | #include "shorthand.h" |
2 | #include "bd-font.c" | 4 | #include "bd-font.c" |
3 | #include "gba-buttons.c" | 5 | #include "gba-buttons.c" |
@@ -105,10 +107,10 @@ typedef u16 ScreenBlock[1024]; | |||
105 | // FRAMEBUFFER[y][x] = color; | 107 | // FRAMEBUFFER[y][x] = color; |
106 | // | 108 | // |
107 | typedef Color Scanline[SCREEN_WIDTH]; | 109 | typedef Color Scanline[SCREEN_WIDTH]; |
108 | #define FRAMEBUFFER ((Scanline*)MEM_VRAM) | 110 | #define FRAMEBUFFER ((Scanline*)MEM_VRAM) |
109 | #define SCREEN_BUFFER ((vu16*) MEM_VRAM) | 111 | #define SCREEN_BUFFER ((u16*) MEM_VRAM) |
110 | #define PAL_BUFFER_BG ((vu16*) MEM_PAL) | 112 | #define PAL_BUFFER_BG ((u16*) MEM_PAL) |
111 | #define PAL_BUFFER_SPRITES ((vu16*) 0x05000200) | 113 | #define PAL_BUFFER_SPRITES ((u16*) 0x05000200) |
112 | 114 | ||
113 | // | 115 | // |
114 | // Colors. | 116 | // Colors. |
@@ -534,7 +536,7 @@ typedef struct ButtonSprite { | |||
534 | typedef struct MultiSprite { | 536 | typedef struct MultiSprite { |
535 | ObjState *sprites; | 537 | ObjState *sprites; |
536 | AnimationEntry **animations; | 538 | AnimationEntry **animations; |
537 | int frame; | 539 | size_t frame; |
538 | size_t n_obj; | 540 | size_t n_obj; |
539 | size_t n_frames; | 541 | size_t n_frames; |
540 | BtnState state; | 542 | BtnState state; |