No more cryptic names ...

CMakeLists.txt

@@ -138,12 +138,12 @@ SET(SRC_MAIN
     src/common/memgzio.c
 )
 
-SET(SRC_AGB
-    src/agb/agbprint.cpp
-    src/agb/GBA.cpp
-    src/agb/GBAGfx.cpp
-    src/agb/GBA-thumb.cpp
-    src/agb/GBA-arm.cpp
+SET(SRC_GBA
+    src/gba/agbprint.cpp
+    src/gba/GBA.cpp
+    src/gba/GBAGfx.cpp
+    src/gba/GBA-thumb.cpp
+    src/gba/GBA-arm.cpp
 )
 
 SET(SRC_GB
@@ -268,7 +268,7 @@ ADD_LIBRARY (
     vbamcore
     ${PROJECT_SRCS}
     ${SRC_MAIN}
-    ${SRC_AGB}
+    ${SRC_GBA}
     ${SRC_GB}
     ${SRC_APU}
     ${SRC_FEX_MINI}

src/Cheats.cpp

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "agb/GBA.h"
-#include "agb/GBAinline.h"
+#include "gba/GBA.h"
+#include "gba/GBAinline.h"
 #include "Cheats.h"
 #include "Globals.h"
 #include "NLS.h"

src/EEprom.cpp

@@ -1,5 +1,5 @@
 #include <memory.h>
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "EEprom.h"
 #include "Util.h"
 

src/Flash.cpp

@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <memory.h>
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
 #include "Flash.h"
 #include "Sram.h"

src/Globals.cpp

@@ -1,4 +1,4 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 
 #ifdef BKPT_SUPPORT
 int  oldreg[17];

src/Globals.h

@@ -1,7 +1,7 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
-#include "agb/GBA.h"
+#include "common/Types.h"
 
 #define VERBOSE_SWI                  1
 #define VERBOSE_UNALIGNED_MEMORY     2

src/Mode0.cpp

@@ -1,6 +1,6 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBAGfx.h"
 
 void mode0RenderLine()
 {

src/Mode1.cpp

@@ -1,6 +1,6 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBAGfx.h"
 
 void mode1RenderLine()
 {

src/Mode2.cpp

@@ -1,6 +1,6 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBAGfx.h"
 
 void mode2RenderLine()
 {

src/Mode3.cpp

@@ -1,6 +1,6 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBAGfx.h"
 
 void mode3RenderLine()
 {

src/Mode4.cpp

@@ -1,5 +1,5 @@
-#include "agb/GBA.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBA.h"
+#include "gba/GBAGfx.h"
 #include "Globals.h"
 
 void mode4RenderLine()

src/Mode5.cpp

@@ -1,6 +1,6 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
-#include "agb/GBAGfx.h"
+#include "gba/GBAGfx.h"
 
 void mode5RenderLine()
 {

src/RTC.cpp

@@ -1,5 +1,5 @@
 #include "System.h"
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
 #include "common/Port.h"
 #include "Util.h"

src/Sound.cpp

@@ -2,7 +2,7 @@
 
 #include "Sound.h"
 
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
 #include "Util.h"
 #include "common/Port.h"

src/Sram.cpp

@@ -1,4 +1,4 @@
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
 #include "Flash.h"
 #include "Sram.h"

src/Util.cpp

@@ -13,7 +13,7 @@ extern "C" {
 #include "NLS.h"
 #include "Util.h"
 #include "Flash.h"
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "Globals.h"
 #include "RTC.h"
 #include "common/Port.h"

src/armdis.cpp

@@ -5,7 +5,7 @@
 
 #include "System.h"
 #include "common/Port.h"
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "armdis.h"
 #include "elf.h"
 

src/bios.cpp

@@ -2,9 +2,9 @@
 #include <memory.h>
 #include <stdlib.h>
 
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "bios.h"
-#include "agb/GBAinline.h"
+#include "gba/GBAinline.h"
 #include "Globals.h"
 
 s16 sineTable[256] = {

src/common/SoundSDL.cpp

@@ -17,9 +17,8 @@
 
 #include "SoundSDL.h"
 
-#include "../Globals.h"
-
 extern int emulating;
+extern bool speedup;
 
 SoundSDL::SoundSDL():
 	_rbuf(0)
@@ -64,7 +63,7 @@ void SoundSDL::write(u16 * finalWave, int length)
 
 		// If emulating and not in speed up mode, synchronize to audio
 		// by waiting till there is enough room in the buffer
-		if (emulating && !speedup && !systemThrottle)
+		if (emulating && !speedup)
 		{
 			SDL_CondWait(_cond, _mutex);
 		}

src/elf.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 #include "common/Port.h"
 #include "elf.h"
 #include "NLS.h"

src/gb/gbGfx.cpp

@@ -1,6 +1,7 @@
 #include <memory.h>
 
-#include "../Globals.h"
+#include "../common/Types.h"
+#include "../Util.h"
 #include "gbGlobals.h"
 #include "gbSGB.h"
 
@@ -42,6 +43,7 @@ u8 gbInvertTab[256] = {
 u16 gbLineMix[160];
 u16 gbWindowColor[160];
 extern int inUseRegister_WY;
+extern int layerSettings;
 
 void gbRenderLine()
 {

src/gtk/system.cpp

@@ -16,8 +16,6 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#include "../agb/GBA.h"
-#include "../Util.h"
 #include "../sdl/inputSDL.h"
 #include "../Sound.h"
 #include "../common/SoundSDL.h"

src/gtk/window.cpp

@@ -26,7 +26,7 @@
 
 #include <SDL.h>
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 #include "../gb/gb.h"
 #include "../gb/gbGlobals.h"
 #include "../gb/gbSound.h"

src/gtk/windowcallbacks.cpp

@@ -25,7 +25,7 @@
 
 #include <SDL.h>
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 #include "../gb/gb.h"
 #include "../gb/gbGlobals.h"
 #include "../gb/gbPrinter.h"

src/remote.cpp

@@ -24,7 +24,7 @@
 # define write _write
 #endif // _WIN32
 
-#include "agb/GBA.h"
+#include "gba/GBA.h"
 
 extern bool debugger;
 extern void CPUUpdateCPSR();

src/sdl/SDL.cpp

@@ -37,8 +37,8 @@
 
 #include <SDL.h>
 
-#include "../agb/GBA.h"
-#include "../agb/agbprint.h"
+#include "../gba/GBA.h"
+#include "../gba/agbprint.h"
 #include "../Flash.h"
 #include "../common/Patch.h"
 #include "../RTC.h"

src/sdl/debugger.cpp

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 #include "../common/Port.h"
 #include "../Sound.h"
 #include "../armdis.h"

src/sdl/exprNode.cpp

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../agb/GBA.h"
+#include "../gba/GBA.h"
 #include "../common/Port.h"
 #include "../elf.h"
 #include "exprNode.h"