diff --git a/src/gba/gba-bios.c b/src/gba/gba-bios.c
index de33845d1..bfd39ced5 100644
--- a/src/gba/gba-bios.c
+++ b/src/gba/gba-bios.c
@@ -116,7 +116,8 @@ static void _Div(struct ARMCore* cpu, int32_t num, int32_t denom) {
 
 void GBASwi16(struct ARMCore* cpu, int immediate) {
 	struct GBA* gba = (struct GBA*) cpu->master;
-	GBALog(gba, GBA_LOG_DEBUG, "SWI: %02x", immediate);
+	GBALog(gba, GBA_LOG_SWI, "SWI: %02X r0: %08X r1: %08X r2: %08X r3: %08X",
+		immediate, cpu->gprs[0], cpu->gprs[1], cpu->gprs[2], cpu->gprs[3]);
 
 	if (gba->memory.fullBios) {
 		ARMRaiseSWI(cpu);
diff --git a/src/gba/gba.h b/src/gba/gba.h
index 281667974..9ae2b0771 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -43,7 +43,10 @@ enum GBALogLevel {
 	GBA_LOG_DEBUG = 0x10,
 	GBA_LOG_STUB = 0x20,
 
-	GBA_LOG_GAME_ERROR = 0x100
+	GBA_LOG_GAME_ERROR = 0x100,
+	GBA_LOG_SWI = 0x200,
+
+	GBA_LOG_ALL = 0x33F
 };
 
 enum GBAKey {