From be7f1fc5a0c41339e6e4aa104b6f5f3da52d2a6a Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Tue, 6 Jun 2023 10:59:14 +0200
Subject: [PATCH] small changes and fixes

---
 src/backend/Core.cpp          | 2 +-
 src/backend/GameDB.cpp        | 1 -
 src/backend/core/mmio/PIF.cpp | 7 ++-----
 src/backend/core/mmio/PIF.hpp | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp
index 25b288e8..af459eb6 100644
--- a/src/backend/Core.cpp
+++ b/src/backend/Core.cpp
@@ -23,11 +23,11 @@ void Core::LoadROM(const std::string& rom_) {
   
   cpu.mem.LoadROM(rom);
   GameDB::match(cpu.mem);
+  cpu.mem.mmio.vi.isPal = cpu.mem.IsROMPAL();
   cpu.mem.mmio.si.pif.InitDevices(cpu.mem.saveType);
   cpu.mem.mmio.si.pif.LoadMempak(rom_);
   cpu.mem.mmio.si.pif.LoadEeprom(cpu.mem.saveType, rom_);
   cpu.mem.mmio.si.pif.ExecutePIF(cpu.mem, cpu.regs);
-  cpu.mem.mmio.vi.isPal = cpu.mem.IsROMPAL();
 }
 
 void Core::Run(float volumeL, float volumeR) {
diff --git a/src/backend/GameDB.cpp b/src/backend/GameDB.cpp
index 080b4671..af219fef 100644
--- a/src/backend/GameDB.cpp
+++ b/src/backend/GameDB.cpp
@@ -24,7 +24,6 @@ void GameDB::match(Mem& mem) {
                 i.name, i.regions, rom.header.countryCode[0]);
       }
     }
-
   }
 
   Util::debug("Did not match any Game DB entries. Code: {} Region: {}", mem.rom.code, mem.rom.header.countryCode[0]);
diff --git a/src/backend/core/mmio/PIF.cpp b/src/backend/core/mmio/PIF.cpp
index cf344359..b1af5d2b 100644
--- a/src/backend/core/mmio/PIF.cpp
+++ b/src/backend/core/mmio/PIF.cpp
@@ -5,7 +5,6 @@
 #include <SDL_keyboard.h>
 #include <cic_nus_6105/n64_cic_nus_6105.hpp>
 #include <cassert>
-#include <MupenMovie.hpp>
 
 #define MEMPAK_SIZE 32768
 
@@ -294,8 +293,7 @@ void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
     for (int i = 0; i < 8; i++) {
       res[i] = eeprom[(offset * 8) + i];
     }
-  }
-  else {
+  } else {
     Util::panic("EEPROM read on bad channel {}", channel);
   }
 }
@@ -313,8 +311,7 @@ void PIF::EepromWrite(u8* cmd, u8* res, const Mem& mem) const {
     }
 
     res[0] = 0; // Error byte, I guess it always succeeds?
-  }
-  else {
+  } else {
     Util::panic("EEPROM write on bad channel {}", channel);
   }
 }
diff --git a/src/backend/core/mmio/PIF.hpp b/src/backend/core/mmio/PIF.hpp
index a260f0c9..6b81518f 100644
--- a/src/backend/core/mmio/PIF.hpp
+++ b/src/backend/core/mmio/PIF.hpp
@@ -110,7 +110,7 @@ struct PIF {
   bool gamepadConnected = false;
   SDL_GameController* gamepad{};
   JoybusDevice joybusDevices[6]{};
-  u8 bootrom[PIF_BOOTROM_SIZE]{}, ram[PIF_RAM_SIZE]{}, *mempak, *eeprom;
+  u8 bootrom[PIF_BOOTROM_SIZE]{}, ram[PIF_RAM_SIZE]{}, *mempak{}, *eeprom{};
   int channel = 0;
   std::string mempakPath{}, eepromPath{};
   size_t eepromSize{};