From 70900cfadbb835be4c571b891545569934e5a62f Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 24 Jun 2017 16:03:55 -0400 Subject: [PATCH] Add files via upload --- libgambatte/src/gambatte.cpp | 4 +--- libgambatte/src/initstate.cpp | 2 +- libgambatte/src/savestate.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libgambatte/src/gambatte.cpp b/libgambatte/src/gambatte.cpp index 9a4fa62bf2..c3843a862c 100644 --- a/libgambatte/src/gambatte.cpp +++ b/libgambatte/src/gambatte.cpp @@ -98,10 +98,7 @@ void GB::reset(const std::uint32_t now) { { p_->cpu.reset_bios(0); } - else - { - } setInitState(state, p_->cpu.isCgb(), p_->gbaCgbMode, now, use_bios); p_->cpu.loadState(state); if (length > 0) @@ -237,6 +234,7 @@ SYNCFUNC(GB) SSS(p_->cpu); NSS(p_->gbaCgbMode); NSS(p_->vbuff); + NSS(use_bios); } } diff --git a/libgambatte/src/initstate.cpp b/libgambatte/src/initstate.cpp index e2e1892a76..307a7f460c 100644 --- a/libgambatte/src/initstate.cpp +++ b/libgambatte/src/initstate.cpp @@ -1182,7 +1182,7 @@ void gambatte::setInitState(SaveState &state, const bool cgb, const bool gbaCgbM state.cpu.cycleCounter = 0; state.mem.ioamhram.ptr[0x140] = 0x00; state.mem.ioamhram.ptr[0x104] = 0x00; - + state.mem.using_bios = true; } else { diff --git a/libgambatte/src/savestate.h b/libgambatte/src/savestate.h index e0726764aa..be3f21322a 100644 --- a/libgambatte/src/savestate.h +++ b/libgambatte/src/savestate.h @@ -78,6 +78,7 @@ struct SaveState { bool enableRam; bool rambankMode; bool hdmaTransfer; + bool using_bios; } mem; struct PPU {