Skip to content

Commit

Permalink
rm unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
pashutk committed Oct 9, 2016
1 parent 23f1501 commit 787115a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 27 deletions.
34 changes: 7 additions & 27 deletions game.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@ BOOLEAN check_bottom_collision(DWORD y) {
}

BOOLEAN check_pipe_collision(DWORD y, INT8 level) {
// const UINT8 player_height = flbird_tile_map_height;
// // printf("%d %d\n", y, level);
// if (y < level * SPRITE_HEIGHT + player_height * SPRITE_HEIGHT ||
// y > level * SPRITE_HEIGHT + PIPE_GAP * SPRITE_HEIGHT) {
// return TRUE;
// } else {
const UINT8 player_height = flbird_tile_map_height;

if (y < level * SPRITE_HEIGHT + player_height * SPRITE_HEIGHT ||
y > level * SPRITE_HEIGHT + PIPE_GAP * SPRITE_HEIGHT) {
return TRUE;
} else {
return FALSE;
// }
}
}

INT16 get_player_y_pos(UINT8 t, UINT8 yd) {
Expand Down Expand Up @@ -674,7 +674,6 @@ void main() {
INT8 tutorial_step_counter = 0;
UINT16 pipe_number = 1;
UINT16 current_score = 0;
UINT8 ttt[5];

enum game_states current_game_state = TRANSITION_TO_TITLE;
game_sprite_object player;
Expand All @@ -684,17 +683,6 @@ void main() {
NR52_REG = 0x80;
NR51_REG = 0xFF;
NR50_REG = 0x77;
//
// NR10_REG = 0x1E;
// NR11_REG = 0x10;
// NR12_REG = 0xF3;
// NR13_REG = 0x00;
// NR14_REG = 0x87;


// // Mute channel 1 (there are other ways to do this)
// NR12 = 0;
// NR14 = 0x80;

ENABLE_RAM_MBC1;

Expand Down Expand Up @@ -763,14 +751,6 @@ void main() {

// set_interrupts(VBL_IFLAG | LCD_IFLAG);

for (i = 0; i < 5; i++) {
ttt[i] = 1;
}

// fill_pipe_row_with_numbers(ttt, 0, (INT16) RAMPtr[0]);

// set_bkg_tiles(2, 2, 5, 1, ttt);

draw_land();

draw_title();
Expand Down
Binary file modified game.gb
Binary file not shown.

0 comments on commit 787115a

Please sign in to comment.