From 2762b3aa8bc6cc62e7492ea885baabc71a1c141d Mon Sep 17 00:00:00 2001
From: MadMaurice <madmaurice@zom.bi>
Date: Tue, 5 Sep 2023 21:32:42 +0200
Subject: [PATCH] Move MBC implementations into cartridge subfolder

---
 Makeconf                           | 2 +-
 {memory => cartridge}/mbc/mbc1.cpp | 2 +-
 {memory => cartridge}/mbc/mbc1.h   | 0
 main.cpp                           | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {memory => cartridge}/mbc/mbc1.cpp (96%)
 rename {memory => cartridge}/mbc/mbc1.h (100%)

diff --git a/Makeconf b/Makeconf
index 48f99c4..5f4ffd5 100644
--- a/Makeconf
+++ b/Makeconf
@@ -8,9 +8,9 @@ modules_libemu.a := memory/device.o \
                     memory/bootrom_overlay.o \
                     memory/register.o \
                     memory/bank.o \
-                    memory/mbc/mbc1.o \
                     cpu/cpu.o \
                     cpu/decoder.o \
+                    cartridge/mbc/mbc1.o \
                     cartridge/cartridge.o
 
 modules_vgbc := main.o libemu.a
diff --git a/memory/mbc/mbc1.cpp b/cartridge/mbc/mbc1.cpp
similarity index 96%
rename from memory/mbc/mbc1.cpp
rename to cartridge/mbc/mbc1.cpp
index 682b584..0419df8 100644
--- a/memory/mbc/mbc1.cpp
+++ b/cartridge/mbc/mbc1.cpp
@@ -1,4 +1,4 @@
-#include <memory/mbc/mbc1.h>
+#include <cartridge/mbc/mbc1.h>
 #include <misc/exception.h>
 
 MBC1::MBC1(Cartridge& cart)
diff --git a/memory/mbc/mbc1.h b/cartridge/mbc/mbc1.h
similarity index 100%
rename from memory/mbc/mbc1.h
rename to cartridge/mbc/mbc1.h
diff --git a/main.cpp b/main.cpp
index 860efb8..8fef7cb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,6 @@
 #include <cpu/cpu.h>
 #include <cartridge/cartridge.h>
-#include <memory/mbc/mbc1.h>
+#include <cartridge/mbc/mbc1.h>
 #include <memory/ram.h>
 #include <memory/bus.h>
 #include <memory/register.h>