From bad415fa23fb1ea8909735e023ea6dd659fb4ed2 Mon Sep 17 00:00:00 2001 From: Matthew Laux Date: Wed, 17 May 2023 23:49:35 -0500 Subject: [PATCH] fix button state for pokemon --- cli/CMakeLists.txt | 4 ++-- src/cpu.c | 2 +- src/dmg.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index ccbf053..9a076bc 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -34,8 +34,8 @@ add_executable(gb6 ) target_link_libraries(gb6 - "-framework OpenGL" - "-framework CoreFoundation" + "-lGL" + "-ldl" "${SDL_LIBS}" ) diff --git a/src/cpu.c b/src/cpu.c index 6db4f04..2b75c19 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -976,7 +976,7 @@ void cpu_step(struct cpu *cpu) break; case 0x76: // HALT - cpu->halted = 1; + //cpu->halted = 1; break; case 0xc1: // POP BC diff --git a/src/dmg.c b/src/dmg.c index 60c37e0..b4f6b3d 100644 --- a/src/dmg.c +++ b/src/dmg.c @@ -40,7 +40,7 @@ void dmg_set_button(struct dmg *dmg, int field, int button, int pressed) static u8 get_button_state(struct dmg *dmg) { - u8 ret = 0; + u8 ret = 0xf0; if (dmg->action_selected) { ret |= dmg->action_buttons; }