diff --git a/gba/cartest/src/cartest.c b/gba/cartest/src/cartest.c index e518b4e..a5a4b27 100644 --- a/gba/cartest/src/cartest.c +++ b/gba/cartest/src/cartest.c @@ -1,6 +1,4 @@ -//--------------------------------------------------------------------------------- // Initial code from devkitARM - http://www.devkit.tk -//--------------------------------------------------------------------------------- #include "gba_video.h" #include "gba_systemcalls.h" #include "gba_input.h" @@ -13,12 +11,12 @@ #include #include -//--------------------------------------------------------------------------------- -// header for binary data generated by bin2o macro in makefile -//--------------------------------------------------------------------------------- +// headers for binary data generated by bin2o macro in makefile #include "car_pal_bin.h" #include "car_bin.h" #include "chaser_bin.h" + + #include "sinlut.h" typedef s32 FIXED; // 32bit FIXED in 24.8 format @@ -26,40 +24,27 @@ typedef s32 FIXED; // 32bit FIXED in 24.8 format #define INT2FIX(n) ((n)<>FIX_SHIFT) - - #define SIN_SIZE 512 #define SIN_MASK (SIN_SIZE-1) #define lut_sin(x) _sinLUT[x] #define lut_cos(x) _sinLUT[(x + (SIN_SIZE>>2)) & SIN_MASK] -//--------------------------------------------------------------------------------- -// storage space for palette data -//--------------------------------------------------------------------------------- -u16 PaletteBuffer[256]; #define NUMCHASERS 10 -// 4 sprites and one +u16 PaletteBuffer[256]; OBJATTR oe_buffer[1+NUMCHASERS]; OBJAFFINE *const oa_buffer = (OBJAFFINE*)oe_buffer; unsigned int frame; - -//--------------------------------------------------------------------------------- void VblankInterrupt() -//--------------------------------------------------------------------------------- { frame += 1; ScanKeys(); } -//--------------------------------------------------------------------------------- -// Program entry point -//--------------------------------------------------------------------------------- int main(void) -//--------------------------------------------------------------------------------- { OBJATTR*car = &oe_buffer[0]; OBJAFFINE*car_aff = &oa_buffer[0];