X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=7c027dc9aaede2a32a30ca61373fcc4abe746cd7;hb=d985165d0e156c785895a5272113ff477bebeeb8;hp=96620f3d1ac1d1897107c9dba777c2fa54c633ad;hpb=097d03fa2406fca819b27b698ffb1cfc8ac445c2;p=gbajam22 diff --git a/src/gamescr.c b/src/gamescr.c index 96620f3..7c027dc 100644 --- a/src/gamescr.c +++ b/src/gamescr.c @@ -7,18 +7,31 @@ #include "intr.h" #include "input.h" #include "player.h" +#include "gba.h" #include "sprite.h" #include "debug.h" #include "level.h" #include "xgl.h" #include "polyfill.h" +static int gamescr_start(void); +static void gamescr_stop(void); +static void gamescr_frame(void); +static void gamescr_vblank(void); + static void update(void); static void draw(void); -static void vblank(void); + +static struct screen gamescr = { + "game", + gamescr_start, + gamescr_stop, + gamescr_frame, + gamescr_vblank +}; static int nframes, num_vbl, backbuf; -static uint16_t *vram[] = { (uint16_t*)VRAM_LFB_FB0_ADDR, (uint16_t*)VRAM_LFB_FB1_ADDR }; +static uint16_t *vram[] = { gba_vram_lfb0, gba_vram_lfb1 }; static const char *testlvl = "################\n" @@ -55,13 +68,17 @@ static struct level *lvl; static struct player player; -void gamescr(void) +struct screen *init_game_screen(void) +{ + return &gamescr; +} + +static int gamescr_start(void) { int i; - unsigned char *fb; uint16_t *cmap; - REG_DISPCNT = 4 | DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1; + gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1); vblperf_setcolor(1); @@ -72,7 +89,7 @@ void gamescr(void) init_player(&player, lvl); player.phi = 0x100; - cmap = (uint16_t*)CRAM_BG_ADDR; + cmap = gba_bgpal; *cmap++ = 0; for(i=1; i<255; i++) { *cmap++ = rand(); @@ -82,26 +99,31 @@ void gamescr(void) select_input(BN_DPAD | BN_A | BN_B); - mask(INTR_VBLANK); - screen_vblank = vblank; - unmask(INTR_VBLANK); - nframes = 0; - for(;;) { - backbuf = ++nframes & 1; - fb = (unsigned char*)vram[backbuf]; + return 0; +} - polyfill_framebuffer(fb, 240, 160); - fillblock_16byte(fb, 0, 240 * 160 / 16); +static void gamescr_stop(void) +{ +} + +static void gamescr_frame(void) +{ + unsigned char *fb; - update(); - draw(); + backbuf = ++nframes & 1; + fb = (unsigned char*)vram[backbuf]; - vblperf_end(); - wait_vblank(); - present(backbuf); - vblperf_begin(); - } + polyfill_framebuffer(fb, 240, 160); + fillblock_16byte(fb, 0, 240 * 160 / 16); + + update(); + draw(); + + vblperf_end(); + wait_vblank(); + present(backbuf); + vblperf_begin(); } static void update(void) @@ -140,8 +162,10 @@ static void draw(void) } } +#ifdef BUILD_GBA __attribute__((noinline, target("arm"), section(".iwram"))) -static void vblank(void) +#endif +static void gamescr_vblank(void) { num_vbl++; }