diff options
Diffstat (limited to 'source/main.c')
| -rw-r--r-- | source/main.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/source/main.c b/source/main.c index ae0cf05..d0a60b1 100644 --- a/source/main.c +++ b/source/main.c @@ -13,28 +13,6 @@ OBJ_ATTR obj_buffer[128]; OBJ_AFFINE *obj_aff_buffer= (OBJ_AFFINE*)obj_buffer; // Object affine-buffer -void obj_test() { - int x, y; - x = 10; y = 10; - u32 tid= 0, pb= 0; - OBJ_ATTR *player = &obj_buffer[0]; - - obj_set_attr(player, - ATTR0_SQUARE, - ATTR1_SIZE_16, - ATTR2_PALBANK(pb) | tid - ); - - obj_set_pos(player, x, y); - - while(1) { - vid_vsync(); - key_poll(); - - oam_copy(oam_mem, obj_buffer, 1); - } -} - int main() { memcpy(&tile_mem[4][0], playerTiles, playerTilesLen); memcpy(pal_obj_mem, playerPal, playerPalLen); @@ -43,8 +21,7 @@ int main() { REG_DISPCNT= DCNT_OBJ | DCNT_OBJ_1D; - playerObject player = createPlayerObject(&obj_buffer[0], 0, 0); - + playerObject player = createPlayerObject(&obj_buffer[0], &obj_aff_buffer[0],0, 0); while(1) { vid_vsync(); @@ -54,8 +31,9 @@ int main() { player.vel.dy -= 9 << FIX_SHIFT; } - updatePlayer(&player, 140); - oam_copy(oam_mem, obj_buffer, 1); + updatePlayer(&player, 120); + obj_affine_copy(obj_aff_mem, player.affine, 1); + obj_copy(obj_mem, player.obj, 1); } return 0; |