Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

speling is difikult

This commit is contained in:
Lior Halphon 2019-03-16 20:56:22 +02:00
parent 936afedb4b
commit 7242ddae64
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/display.c
View File

@ -327,12 +327,12 @@ static void add_object_from_index(GB_gameboy_t *gb, unsigned index)
if (y <= gb->current_line && y + (height_16? 16 : 8) > gb->current_line) { if (y <= gb->current_line && y + (height_16? 16 : 8) > gb->current_line) {
unsigned j = 0; unsigned j = 0;
for (; j < gb->n_visible_objs; j++) { for (; j < gb->n_visible_objs; j++) {
if (gb->obj_comperators[j] <= objects[index].x) break; if (gb->obj_comparators[j] <= objects[index].x) break;
} }
memmove(gb->visible_objs + j + 1, gb->visible_objs + j, gb->n_visible_objs - j); memmove(gb->visible_objs + j + 1, gb->visible_objs + j, gb->n_visible_objs - j);
memmove(gb->obj_comperators + j + 1, gb->obj_comperators + j, gb->n_visible_objs - j); memmove(gb->obj_comparators + j + 1, gb->obj_comparators + j, gb->n_visible_objs - j);
gb->visible_objs[j] = index; gb->visible_objs[j] = index;
gb->obj_comperators[j] = objects[index].x; gb->obj_comparators[j] = objects[index].x;
gb->n_visible_objs++; gb->n_visible_objs++;
} }
} }
@ -764,12 +764,12 @@ void GB_display_run(GB_gameboy_t *gb, uint8_t cycles)
while (gb->n_visible_objs != 0 && while (gb->n_visible_objs != 0 &&
(gb->position_in_line < 160 || gb->position_in_line >= (uint8_t)(-8)) && (gb->position_in_line < 160 || gb->position_in_line >= (uint8_t)(-8)) &&
gb->obj_comperators[gb->n_visible_objs - 1] < (uint8_t)(gb->position_in_line + 8)) { gb->obj_comparators[gb->n_visible_objs - 1] < (uint8_t)(gb->position_in_line + 8)) {
gb->n_visible_objs--; gb->n_visible_objs--;
} }
while (gb->n_visible_objs != 0 && while (gb->n_visible_objs != 0 &&
(gb->io_registers[GB_IO_LCDC] & 2 || GB_is_cgb(gb)) && (gb->io_registers[GB_IO_LCDC] & 2 || GB_is_cgb(gb)) &&
gb->obj_comperators[gb->n_visible_objs - 1] == (uint8_t)(gb->position_in_line + 8)) { gb->obj_comparators[gb->n_visible_objs - 1] == (uint8_t)(gb->position_in_line + 8)) {
while (gb->fetcher_state < 5) { while (gb->fetcher_state < 5) {
advance_fetcher_state_machine(gb); advance_fetcher_state_machine(gb);
@ -779,7 +779,7 @@ void GB_display_run(GB_gameboy_t *gb, uint8_t cycles)
/* Todo: Measure if penalty occurs before or after waiting for the fetcher. */ /* Todo: Measure if penalty occurs before or after waiting for the fetcher. */
if (gb->extra_penalty_for_sprite_at_0 != 0) { if (gb->extra_penalty_for_sprite_at_0 != 0) {
if (gb->obj_comperators[gb->n_visible_objs - 1] == 0) { if (gb->obj_comparators[gb->n_visible_objs - 1] == 0) {
gb->cycles_for_line += gb->extra_penalty_for_sprite_at_0; gb->cycles_for_line += gb->extra_penalty_for_sprite_at_0;
GB_SLEEP(gb, display, 28, gb->extra_penalty_for_sprite_at_0); GB_SLEEP(gb, display, 28, gb->extra_penalty_for_sprite_at_0);
gb->extra_penalty_for_sprite_at_0 = 0; gb->extra_penalty_for_sprite_at_0 = 0;

2
Core/gb.h
View File

@ -460,7 +460,7 @@ struct GB_gameboy_internal_s {
bool oam_fifo_paused; bool oam_fifo_paused;
bool in_window; bool in_window;
uint8_t visible_objs[10]; uint8_t visible_objs[10];
uint8_t obj_comperators[10]; uint8_t obj_comparators[10];
uint8_t n_visible_objs; uint8_t n_visible_objs;
uint8_t oam_search_index; uint8_t oam_search_index;
uint8_t accessed_oam_row; uint8_t accessed_oam_row;