Cocoa Port:

- Fix building for all Xcode projects. (Regression from r4723).
- Add support for "Retail (Auto-detect) and "Standard Retail Memory Card + ROM" devices in the SLOT-1 Manager.

General:
- Fix compiler warnings in bios.cpp. (Regression from r4722).
- Fix include path in advanscene.cpp. (Regression from r4723).
- Fix compiling when using GCC and Clang. (Regression from r4692).

desmume/src/armcpu.h

@@ -62,14 +62,14 @@ inline T SIGNED_UNDERFLOW(T a,T b,T c) { return BIT31(((a)&(~(b))&(~c)) | ((~a)&
 			( (val >> 24) & 0x000000FF) 
 
 #define bswap64(x) \
-			( (x << 56) & 0xff00000000000000UL ) | \
+			( (x << 56) & 0xff00000000000000ULL ) | \
-			( (x << 40) & 0x00ff000000000000UL ) | \
+			( (x << 40) & 0x00ff000000000000ULL ) | \
-			( (x << 24) & 0x0000ff0000000000UL ) | \
+			( (x << 24) & 0x0000ff0000000000ULL ) | \
-			( (x <<  8) & 0x000000ff00000000UL ) | \
+			( (x <<  8) & 0x000000ff00000000ULL ) | \
-			( (x >>  8) & 0x00000000ff000000UL ) | \
+			( (x >>  8) & 0x00000000ff000000ULL ) | \
-			( (x >> 24) & 0x0000000000ff0000UL ) | \
+			( (x >> 24) & 0x0000000000ff0000ULL ) | \
-			( (x >> 40) & 0x000000000000ff00UL ) | \
+			( (x >> 40) & 0x000000000000ff00ULL ) | \
-			( (x >> 56) & 0x00000000000000ffUL ) 
+			( (x >> 56) & 0x00000000000000ffULL ) 
 
 // ============================= CPRS flags funcs
 inline bool CarryFrom(s32 left, s32 right)

desmume/src/bios.cpp

@@ -1218,7 +1218,7 @@ u32 (* ARM_swi_tab[2][32])()={
 };
 
 #define BIOS_NOP "bios_nop"
-char* ARM_swi_names[2][32] = {
+const char* ARM_swi_names[2][32] = {
 	{
 		"SoftReset",			// 0x00
 		BIOS_NOP,				// 0x01

desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj

@@ -113,7 +113,6 @@
 		AB06CD9A135B8ACE00E977B3 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3C135B8ACE00E977B3 /* wifi.cpp */; };
 		AB06CE13135B8AEE00E977B3 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB06CE14135B8AEE00E977B3 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB06CE15135B8AEE00E977B3 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB06CE16135B8AEE00E977B3 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB06CE17135B8AEE00E977B3 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
 		AB06CE18135B8AEE00E977B3 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */; };
@@ -160,7 +159,6 @@
 		AB06CE54135B8AEE00E977B3 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CE11135B8AED00E977B3 /* xstring.cpp */; };
 		AB06CE55135B8AEE00E977B3 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB06CE56135B8AEE00E977B3 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB06CE57135B8AEE00E977B3 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB06CE58135B8AEE00E977B3 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB06CE59135B8AEE00E977B3 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
 		AB06CE5A135B8AEE00E977B3 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */; };
@@ -247,7 +245,6 @@
 		AB0A0D6914AACE9500E83E91 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3C135B8ACE00E977B3 /* wifi.cpp */; };
 		AB0A0D6A14AACE9500E83E91 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB0A0D6B14AACE9500E83E91 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB0A0D6C14AACE9500E83E91 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB0A0D6D14AACE9500E83E91 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB0A0D6E14AACE9500E83E91 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
 		AB0A0D6F14AACE9500E83E91 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */; };
@@ -415,7 +412,6 @@
 		AB18151215D212B4007A6CC3 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD36135B8ACE00E977B3 /* slot1.cpp */; };
 		AB18151315D212B4007A6CC3 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB18151415D212B4007A6CC3 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB18151515D212B4007A6CC3 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB18151615D212B4007A6CC3 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 956B96C213DF4CF900FCDCD0 /* slot1_retail_nand.cpp */; };
 		AB18151715D212B4007A6CC3 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB18151815D212B4007A6CC3 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
@@ -546,7 +542,6 @@
 		AB1815AE15D21469007A6CC3 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD36135B8ACE00E977B3 /* slot1.cpp */; };
 		AB1815AF15D21469007A6CC3 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB1815B015D21469007A6CC3 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB1815B115D21469007A6CC3 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB1815B215D21469007A6CC3 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 956B96C213DF4CF900FCDCD0 /* slot1_retail_nand.cpp */; };
 		AB1815B315D21469007A6CC3 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB1815B415D21469007A6CC3 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
@@ -687,7 +682,6 @@
 		AB18165415D214F2007A6CC3 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD36135B8ACE00E977B3 /* slot1.cpp */; };
 		AB18165515D214F2007A6CC3 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		AB18165615D214F2007A6CC3 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		AB18165715D214F2007A6CC3 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		AB18165815D214F2007A6CC3 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		AB18165915D214F2007A6CC3 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
 		AB18165A15D214F2007A6CC3 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */; };
@@ -763,14 +757,49 @@
 		AB46781714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns */; };
 		AB46781814ABD4890002FF94 /* AppIcon_ROMSave.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780814ABD4890002FF94 /* AppIcon_ROMSave.icns */; };
 		AB46781914ABD4890002FF94 /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780914ABD4890002FF94 /* AppIcon_SaveState.icns */; };
+		AB4C80E417C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80E517C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80E617C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80E717C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80E817C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80E917C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80EA17C5DA070024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80E317C5DA070024D479 /* advanscene.cpp */; };
+		AB4C80F517C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C80F617C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C80F717C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C80F817C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C80F917C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C80FA17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C80FB17C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C80FC17C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C80FD17C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C80FE17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C80FF17C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C810017C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C810117C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C810217C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C810317C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C810417C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C810517C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C810617C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C810717C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C810817C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C810917C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C810A17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C810B17C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C810C17C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C810D17C5DA240024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */; };
+		AB4C810E17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C810F17C5DA240024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */; };
+		AB4C811017C5DA240024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */; };
+		AB4C815917C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815A17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815B17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815C17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815D17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815E17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
+		AB4C815F17C5DC240024D479 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C815817C5DC240024D479 /* encrypt.cpp */; };
 		AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD2E135B8ACE00E977B3 /* OGLRender.cpp */; };
-		AB52F9EB178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9EC178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9ED178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9EE178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9EF178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9F0178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
-		AB52F9F1178CA82200FD6E89 /* encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB52F9EA178CA82200FD6E89 /* encrypt.cpp */; };
 		AB73B12B14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; };
 		AB73B12C14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12A14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm */; };
 		AB73B12D14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; };
@@ -1037,7 +1066,6 @@
 		ABFE4274143E32F0009A3CCE /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3C135B8ACE00E977B3 /* wifi.cpp */; };
 		ABFE4275143E32F0009A3CCE /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */; };
 		ABFE4276143E32F0009A3CCE /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */; };
-		ABFE4277143E32F0009A3CCE /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */; };
 		ABFE4278143E32F0009A3CCE /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */; };
 		ABFE4279143E32F0009A3CCE /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */; };
 		ABFE427A143E32F0009A3CCE /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */; };
@@ -1219,7 +1247,6 @@
 		AB06CD3C135B8ACE00E977B3 /* wifi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wifi.cpp; path = ../wifi.cpp; sourceTree = SOURCE_ROOT; };
 		AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_none.cpp; sourceTree = "<group>"; };
 		AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_r4.cpp; sourceTree = "<group>"; };
-		AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail.cpp; sourceTree = "<group>"; };
 		AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_expMemory.cpp; sourceTree = "<group>"; };
 		AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_gbagame.cpp; sourceTree = "<group>"; };
 		AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_guitarGrip.cpp; sourceTree = "<group>"; };
@@ -1331,8 +1358,16 @@
 		AB46780714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_NintendoDS_ROM.icns; sourceTree = "<group>"; };
 		AB46780814ABD4890002FF94 /* AppIcon_ROMSave.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_ROMSave.icns; sourceTree = "<group>"; };
 		AB46780914ABD4890002FF94 /* AppIcon_SaveState.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_SaveState.icns; sourceTree = "<group>"; };
-		AB52F9E9178CA82200FD6E89 /* encrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = encrypt.h; path = ../encrypt.h; sourceTree = SOURCE_ROOT; };
+		AB4C80E217C5DA070024D479 /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; };
-		AB52F9EA178CA82200FD6E89 /* encrypt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = encrypt.cpp; path = ../encrypt.cpp; sourceTree = SOURCE_ROOT; };
+		AB4C80E317C5DA070024D479 /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; };
+		AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; };
+		AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_mcrom.cpp; sourceTree = "<group>"; };
+		AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_mc.cpp; sourceTree = "<group>"; };
+		AB4C80F217C5DA240024D479 /* slot1comp_mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_mc.h; sourceTree = "<group>"; };
+		AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_rom.cpp; sourceTree = "<group>"; };
+		AB4C80F417C5DA240024D479 /* slot1comp_rom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_rom.h; sourceTree = "<group>"; };
+		AB4C815717C5DC240024D479 /* encrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = encrypt.h; path = ../encrypt.h; sourceTree = SOURCE_ROOT; };
+		AB4C815817C5DC240024D479 /* encrypt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = encrypt.cpp; path = ../encrypt.cpp; sourceTree = SOURCE_ROOT; };
 		AB73B12714BDA01C00F49C92 /* appDelegate_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = appDelegate_legacy.h; path = userinterface/appDelegate_legacy.h; sourceTree = "<group>"; };
 		AB73B12814BDA01C00F49C92 /* emuWindowDelegate_legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emuWindowDelegate_legacy.h; path = userinterface/emuWindowDelegate_legacy.h; sourceTree = "<group>"; };
 		AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = appDelegate_legacy.mm; path = userinterface/appDelegate_legacy.mm; sourceTree = "<group>"; };
@@ -1659,7 +1694,7 @@
 				AB06CD1A135B8ACE00E977B3 /* Disassembler.cpp */,
 				AB06CD1B135B8ACE00E977B3 /* driver.cpp */,
 				AB06CD1C135B8ACE00E977B3 /* emufile.cpp */,
-				AB52F9EA178CA82200FD6E89 /* encrypt.cpp */,
+				AB4C815817C5DC240024D479 /* encrypt.cpp */,
 				AB06CD1D135B8ACE00E977B3 /* FIFO.cpp */,
 				AB06CD1E135B8ACE00E977B3 /* firmware.cpp */,
 				AB06CD1F135B8ACE00E977B3 /* fs-linux.cpp */,
@@ -1709,7 +1744,7 @@
 				AB06CCE7135B8ACE00E977B3 /* driver.h */,
 				AB06CCE9135B8ACE00E977B3 /* emufile.h */,
 				AB06CCE8135B8ACE00E977B3 /* emufile_types.h */,
-				AB52F9E9178CA82200FD6E89 /* encrypt.h */,
+				AB4C815717C5DC240024D479 /* encrypt.h */,
 				AB06CCEA135B8ACE00E977B3 /* FIFO.h */,
 				AB06CCEB135B8ACE00E977B3 /* firmware.h */,
 				AB06CCEC135B8ACE00E977B3 /* fs.h */,
@@ -1805,8 +1840,11 @@
 			children = (
 				AB06CD9C135B8AED00E977B3 /* slot1_none.cpp */,
 				AB06CD9D135B8AED00E977B3 /* slot1_r4.cpp */,
-				AB06CD9E135B8AED00E977B3 /* slot1_retail.cpp */,
+				AB4C80EF17C5DA240024D479 /* slot1_retail_auto.cpp */,
+				AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */,
 				956B96C213DF4CF900FCDCD0 /* slot1_retail_nand.cpp */,
+				AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */,
+				AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */,
 				AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */,
 				AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */,
 				AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */,
@@ -1815,6 +1853,8 @@
 				AB06CDA4135B8AED00E977B3 /* slot2_paddle.cpp */,
 				AB06CDA5135B8AED00E977B3 /* slot2_piano.cpp */,
 				AB06CDA6135B8AED00E977B3 /* slot2_rumblepak.cpp */,
+				AB4C80F217C5DA240024D479 /* slot1comp_mc.h */,
+				AB4C80F417C5DA240024D479 /* slot1comp_rom.h */,
 			);
 			name = addons;
 			path = ../addons;
@@ -1889,6 +1929,7 @@
 				AB06CDE1135B8AED00E977B3 /* decrypt */,
 				AB06CDEE135B8AED00E977B3 /* libfat */,
 				7FA912191426523900E2ABDD /* tinyxml */,
+				AB4C80E317C5DA070024D479 /* advanscene.cpp */,
 				AB06CDDD135B8AED00E977B3 /* ConvertUTF.c */,
 				AB06CDDF135B8AED00E977B3 /* datetime.cpp */,
 				AB06CDE8135B8AED00E977B3 /* dlditool.cpp */,
@@ -1898,6 +1939,7 @@
 				AB06CE0C135B8AED00E977B3 /* task.cpp */,
 				AB06CE0F135B8AED00E977B3 /* vfat.cpp */,
 				AB06CE11135B8AED00E977B3 /* xstring.cpp */,
+				AB4C80E217C5DA070024D479 /* advanscene.h */,
 				AB06CDDE135B8AED00E977B3 /* ConvertUTF.h */,
 				AB06CDE0135B8AED00E977B3 /* datetime.h */,
 				AB06CDEA135B8AED00E977B3 /* emufat.h */,
@@ -2808,7 +2850,6 @@
 				AB06CD94135B8ACE00E977B3 /* slot1.cpp in Sources */,
 				AB06CE55135B8AEE00E977B3 /* slot1_none.cpp in Sources */,
 				AB06CE56135B8AEE00E977B3 /* slot1_r4.cpp in Sources */,
-				AB06CE57135B8AEE00E977B3 /* slot1_retail.cpp in Sources */,
 				AB06CE58135B8AEE00E977B3 /* slot2_expMemory.cpp in Sources */,
 				AB06CE59135B8AEE00E977B3 /* slot2_gbagame.cpp in Sources */,
 				AB06CE5A135B8AEE00E977B3 /* slot2_guitarGrip.cpp in Sources */,
@@ -2882,7 +2923,12 @@
 				ABF50C04169F61540018C08D /* x86operand.cpp in Sources */,
 				ABF50C05169F61540018C08D /* x86util.cpp in Sources */,
 				AB2F5B051704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9F0178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E617C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C80FD17C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C80FE17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C80FF17C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C810017C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815B17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2950,7 +2996,6 @@
 				AB06CD65135B8ACE00E977B3 /* slot1.cpp in Sources */,
 				AB06CE13135B8AEE00E977B3 /* slot1_none.cpp in Sources */,
 				AB06CE14135B8AEE00E977B3 /* slot1_r4.cpp in Sources */,
-				AB06CE15135B8AEE00E977B3 /* slot1_retail.cpp in Sources */,
 				956B96C313DF4CF900FCDCD0 /* slot1_retail_nand.cpp in Sources */,
 				AB06CE16135B8AEE00E977B3 /* slot2_expMemory.cpp in Sources */,
 				AB06CE17135B8AEE00E977B3 /* slot2_gbagame.cpp in Sources */,
@@ -3024,7 +3069,12 @@
 				ABF50C5B169F61540018C08D /* x86operand.cpp in Sources */,
 				ABF50C5C169F61540018C08D /* x86util.cpp in Sources */,
 				AB2F5B081704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9EE178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E917C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C810917C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C810A17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C810B17C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C810C17C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815E17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3092,7 +3142,6 @@
 				AB0A0D6414AACE9500E83E91 /* slot1.cpp in Sources */,
 				AB0A0D6A14AACE9500E83E91 /* slot1_none.cpp in Sources */,
 				AB0A0D6B14AACE9500E83E91 /* slot1_r4.cpp in Sources */,
-				AB0A0D6C14AACE9500E83E91 /* slot1_retail.cpp in Sources */,
 				AB0A0D9C14AACE9500E83E91 /* slot1_retail_nand.cpp in Sources */,
 				AB0A0D6D14AACE9500E83E91 /* slot2_expMemory.cpp in Sources */,
 				AB0A0D6E14AACE9500E83E91 /* slot2_gbagame.cpp in Sources */,
@@ -3166,7 +3215,12 @@
 				ABF50BCA169F61540018C08D /* x86operand.cpp in Sources */,
 				ABF50BCB169F61540018C08D /* x86util.cpp in Sources */,
 				AB2F5B031704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9EC178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E417C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C80F517C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C80F617C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C80F717C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C80F817C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815917C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3234,7 +3288,6 @@
 				AB18151215D212B4007A6CC3 /* slot1.cpp in Sources */,
 				AB18151315D212B4007A6CC3 /* slot1_none.cpp in Sources */,
 				AB18151415D212B4007A6CC3 /* slot1_r4.cpp in Sources */,
-				AB18151515D212B4007A6CC3 /* slot1_retail.cpp in Sources */,
 				AB18151615D212B4007A6CC3 /* slot1_retail_nand.cpp in Sources */,
 				AB18151715D212B4007A6CC3 /* slot2_expMemory.cpp in Sources */,
 				AB18151815D212B4007A6CC3 /* slot2_gbagame.cpp in Sources */,
@@ -3278,7 +3331,12 @@
 				AB18153E15D212B4007A6CC3 /* ringbuffer.cpp in Sources */,
 				AB1816B615D216EC007A6CC3 /* OGLRender.cpp in Sources */,
 				AB2F5B071704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9EB178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E817C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C810517C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C810617C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C810717C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C810817C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815D17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3346,7 +3404,6 @@
 				AB1815AE15D21469007A6CC3 /* slot1.cpp in Sources */,
 				AB1815AF15D21469007A6CC3 /* slot1_none.cpp in Sources */,
 				AB1815B015D21469007A6CC3 /* slot1_r4.cpp in Sources */,
-				AB1815B115D21469007A6CC3 /* slot1_retail.cpp in Sources */,
 				AB1815B215D21469007A6CC3 /* slot1_retail_nand.cpp in Sources */,
 				AB1815B315D21469007A6CC3 /* slot2_expMemory.cpp in Sources */,
 				AB1815B415D21469007A6CC3 /* slot2_gbagame.cpp in Sources */,
@@ -3390,7 +3447,12 @@
 				AB1815DA15D21469007A6CC3 /* ringbuffer.cpp in Sources */,
 				AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */,
 				AB2F5B091704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9ED178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80EA17C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C810D17C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C810E17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C810F17C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C811017C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815F17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3468,7 +3530,6 @@
 				AB18165415D214F2007A6CC3 /* slot1.cpp in Sources */,
 				AB18165515D214F2007A6CC3 /* slot1_none.cpp in Sources */,
 				AB18165615D214F2007A6CC3 /* slot1_r4.cpp in Sources */,
-				AB18165715D214F2007A6CC3 /* slot1_retail.cpp in Sources */,
 				AB18165815D214F2007A6CC3 /* slot2_expMemory.cpp in Sources */,
 				AB18165915D214F2007A6CC3 /* slot2_gbagame.cpp in Sources */,
 				AB18165A15D214F2007A6CC3 /* slot2_guitarGrip.cpp in Sources */,
@@ -3512,7 +3573,12 @@
 				AB18168015D214F2007A6CC3 /* ringbuffer.cpp in Sources */,
 				AB1816B815D216F5007A6CC3 /* OGLRender.cpp in Sources */,
 				AB2F5B041704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9F1178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E517C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C80F917C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C80FA17C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C80FB17C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C80FC17C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815A17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3580,7 +3646,6 @@
 				ABFE426F143E32F0009A3CCE /* slot1.cpp in Sources */,
 				ABFE4275143E32F0009A3CCE /* slot1_none.cpp in Sources */,
 				ABFE4276143E32F0009A3CCE /* slot1_r4.cpp in Sources */,
-				ABFE4277143E32F0009A3CCE /* slot1_retail.cpp in Sources */,
 				ABFE42A7143E32F0009A3CCE /* slot1_retail_nand.cpp in Sources */,
 				ABFE4278143E32F0009A3CCE /* slot2_expMemory.cpp in Sources */,
 				ABFE4279143E32F0009A3CCE /* slot2_gbagame.cpp in Sources */,
@@ -3654,7 +3719,12 @@
 				ABF50C21169F61540018C08D /* x86operand.cpp in Sources */,
 				ABF50C22169F61540018C08D /* x86util.cpp in Sources */,
 				AB2F5B061704EE0100E28885 /* utilities.c in Sources */,
-				AB52F9EF178CA82200FD6E89 /* encrypt.cpp in Sources */,
+				AB4C80E717C5DA070024D479 /* advanscene.cpp in Sources */,
+				AB4C810117C5DA240024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C810217C5DA240024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C810317C5DA240024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C810417C5DA240024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C815C17C5DC240024D479 /* encrypt.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3896,7 +3966,6 @@
 				GCC_ALTIVEC_EXTENSIONS = YES;
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_FAST_MATH = YES;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_MODEL_TUNING = "";
 				"GCC_MODEL_TUNING[sdk=macosx10.4][arch=ppc]" = G4;
@@ -3909,7 +3978,6 @@
 					_DEBUG,
 					"DEBUG=1",
 				);
-				GCC_STRICT_ALIASING = YES;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				"GCC_VERSION[sdk=macosx10.5][arch=ppc64]" = 4.2;
@@ -3942,7 +4010,6 @@
 				GCC_ENABLE_SSE3_EXTENSIONS = YES;
 				GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
 				"GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS[arch=i386]" = NO;
-				GCC_FAST_MATH = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_MODEL_TUNING = "";

desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj

@@ -189,7 +189,6 @@
 		AB2A9A231725F00F0062C1A1 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		AB2A9A241725F00F0062C1A1 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB2A9A251725F00F0062C1A1 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB2A9A261725F00F0062C1A1 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB2A9A271725F00F0062C1A1 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB2A9A281725F00F0062C1A1 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB2A9A291725F00F0062C1A1 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -392,7 +391,6 @@
 		AB2F3BFD15CF9C6000858373 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		AB2F3BFE15CF9C6000858373 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB2F3BFF15CF9C6000858373 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB2F3C0015CF9C6000858373 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB2F3C0115CF9C6000858373 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB2F3C0215CF9C6000858373 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB2F3C0315CF9C6000858373 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -503,6 +501,31 @@
 		AB4C4C6416F55C64002E07CD /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C4C3116F55C64002E07CD /* sse_optimized.cpp */; };
 		AB4C4C6516F55C64002E07CD /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C4C3216F55C64002E07CD /* TDStretch.cpp */; };
 		AB4C4C6616F55C64002E07CD /* WavFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C4C3316F55C64002E07CD /* WavFile.cpp */; };
+		AB4C808D17C5D7780024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */; };
+		AB4C808E17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C808F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */; };
+		AB4C809017C5D7780024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */; };
+		AB4C809117C5D7780024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */; };
+		AB4C809217C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C809317C5D7780024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */; };
+		AB4C809417C5D7780024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */; };
+		AB4C809517C5D7780024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */; };
+		AB4C809617C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C809717C5D7780024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */; };
+		AB4C809817C5D7780024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */; };
+		AB4C809917C5D7780024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */; };
+		AB4C809A17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C809B17C5D7780024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */; };
+		AB4C809C17C5D7780024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */; };
+		AB4C809D17C5D7780024D479 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */; };
+		AB4C809E17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */; };
+		AB4C809F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */; };
+		AB4C80A017C5D7780024D479 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */; };
+		AB4C80AA17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; };
+		AB4C80AB17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; };
+		AB4C80AC17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; };
+		AB4C80AD17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; };
+		AB4C80AE17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; };
 		AB5A795816D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
 		AB5A795916D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
 		AB5A795A16D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
@@ -574,7 +597,6 @@
 		AB711F211481C35F009011C8 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		AB711F221481C35F009011C8 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB711F231481C35F009011C8 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB711F241481C35F009011C8 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB711F251481C35F009011C8 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB711F261481C35F009011C8 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
 		AB711F271481C35F009011C8 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */; };
@@ -759,7 +781,6 @@
 		AB73A9EB1507C9F500A310C8 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		AB73A9EC1507C9F500A310C8 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB73A9ED1507C9F500A310C8 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB73A9EE1507C9F500A310C8 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB73A9EF1507C9F500A310C8 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB73A9F01507C9F500A310C8 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB73A9F11507C9F500A310C8 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -963,7 +984,6 @@
 		ABAD0FF315ACE7A00000EC47 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		ABAD0FF415ACE7A00000EC47 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		ABAD0FF515ACE7A00000EC47 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		ABAD0FF615ACE7A00000EC47 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		ABAD0FF715ACE7A00000EC47 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		ABAD0FF815ACE7A00000EC47 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		ABAD0FF915ACE7A00000EC47 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -1202,6 +1222,14 @@
 		AB4C4C3C16F55C64002E07CD /* STTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STTypes.h; sourceTree = "<group>"; };
 		AB4C4C3D16F55C64002E07CD /* TDStretch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDStretch.h; sourceTree = "<group>"; };
 		AB4C4C3E16F55C64002E07CD /* WavFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavFile.h; sourceTree = "<group>"; };
+		AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; };
+		AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_mcrom.cpp; sourceTree = "<group>"; };
+		AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_mc.cpp; sourceTree = "<group>"; };
+		AB4C808A17C5D7780024D479 /* slot1comp_mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_mc.h; sourceTree = "<group>"; };
+		AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_rom.cpp; sourceTree = "<group>"; };
+		AB4C808C17C5D7780024D479 /* slot1comp_rom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_rom.h; sourceTree = "<group>"; };
+		AB4C80A817C5D7A00024D479 /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; };
+		AB4C80A917C5D7A00024D479 /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; };
 		AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = "<group>"; };
 		AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = "<group>"; };
 		AB5A795616D5A56000ED84B7 /* InputManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputManager.h; sourceTree = "<group>"; };
@@ -1369,7 +1397,6 @@
 		ABD1FECF1345AC8400AF11D1 /* wifi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wifi.cpp; path = ../wifi.cpp; sourceTree = SOURCE_ROOT; };
 		ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_none.cpp; sourceTree = "<group>"; };
 		ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_r4.cpp; sourceTree = "<group>"; };
-		ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail.cpp; sourceTree = "<group>"; };
 		ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_expMemory.cpp; sourceTree = "<group>"; };
 		ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_gbagame.cpp; sourceTree = "<group>"; };
 		ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_guitarGrip.cpp; sourceTree = "<group>"; };
@@ -1989,8 +2016,11 @@
 			children = (
 				ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */,
 				ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */,
+				AB4C808717C5D7780024D479 /* slot1_retail_auto.cpp */,
+				AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */,
 				AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */,
-				ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */,
+				AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */,
+				AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */,
 				ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */,
 				ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */,
 				ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */,
@@ -1999,6 +2029,8 @@
 				ABD1FF081345AC9C00AF11D1 /* slot2_paddle.cpp */,
 				ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */,
 				ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */,
+				AB4C808A17C5D7780024D479 /* slot1comp_mc.h */,
+				AB4C808C17C5D7780024D479 /* slot1comp_rom.h */,
 			);
 			name = addons;
 			path = ../addons;
@@ -2021,6 +2053,7 @@
 				ABD1FF211345ACBF00AF11D1 /* decrypt */,
 				ABD1FF2E1345ACBF00AF11D1 /* libfat */,
 				ABE670241415DE6C00E8E4C9 /* tinyxml */,
+				AB4C80A917C5D7A00024D479 /* advanscene.cpp */,
 				ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */,
 				ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */,
 				ABD1FF281345ACBF00AF11D1 /* dlditool.cpp */,
@@ -2030,6 +2063,7 @@
 				ABD1FF4C1345ACBF00AF11D1 /* task.cpp */,
 				ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */,
 				ABD1FF511345ACBF00AF11D1 /* xstring.cpp */,
+				AB4C80A817C5D7A00024D479 /* advanscene.h */,
 				ABD1FF1E1345ACBF00AF11D1 /* ConvertUTF.h */,
 				ABD1FF201345ACBF00AF11D1 /* datetime.h */,
 				ABD1FF2A1345ACBF00AF11D1 /* emufat.h */,
@@ -2989,7 +3023,6 @@
 				AB2A9A231725F00F0062C1A1 /* slot1.cpp in Sources */,
 				AB2A9A241725F00F0062C1A1 /* slot1_none.cpp in Sources */,
 				AB2A9A251725F00F0062C1A1 /* slot1_r4.cpp in Sources */,
-				AB2A9A261725F00F0062C1A1 /* slot1_retail.cpp in Sources */,
 				AB2A9A271725F00F0062C1A1 /* slot1_retail_nand.cpp in Sources */,
 				AB2A9A281725F00F0062C1A1 /* slot2_expMemory.cpp in Sources */,
 				AB2A9A291725F00F0062C1A1 /* slot2_gbagame.cpp in Sources */,
@@ -3060,6 +3093,11 @@
 				AB2A9A6A1725F00F0062C1A1 /* audiosamplegenerator.cpp in Sources */,
 				AB2A9A6B1725F00F0062C1A1 /* FileMigrationDelegate.mm in Sources */,
 				ABA93EB4178C7D4200CBF50B /* encrypt.cpp in Sources */,
+				AB4C809D17C5D7780024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C809E17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C809F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C80A017C5D7780024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C80AE17C5D7A00024D479 /* advanscene.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3120,7 +3158,6 @@
 				AB2F3BFD15CF9C6000858373 /* slot1.cpp in Sources */,
 				AB2F3BFE15CF9C6000858373 /* slot1_none.cpp in Sources */,
 				AB2F3BFF15CF9C6000858373 /* slot1_r4.cpp in Sources */,
-				AB2F3C0015CF9C6000858373 /* slot1_retail.cpp in Sources */,
 				AB2F3C0115CF9C6000858373 /* slot1_retail_nand.cpp in Sources */,
 				AB2F3C0215CF9C6000858373 /* slot2_expMemory.cpp in Sources */,
 				AB2F3C0315CF9C6000858373 /* slot2_gbagame.cpp in Sources */,
@@ -3191,6 +3228,11 @@
 				AB2145241714DFF4006DDB0F /* audiosamplegenerator.cpp in Sources */,
 				ABAAFBEB172122B6005DDDBE /* FileMigrationDelegate.mm in Sources */,
 				ABA93EB1178C7D4200CBF50B /* encrypt.cpp in Sources */,
+				AB4C809117C5D7780024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C809217C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C809317C5D7780024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C809417C5D7780024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C80AB17C5D7A00024D479 /* advanscene.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3252,7 +3294,6 @@
 				AB711F1C1481C35F009011C8 /* slot1.cpp in Sources */,
 				AB711F221481C35F009011C8 /* slot1_none.cpp in Sources */,
 				AB711F231481C35F009011C8 /* slot1_r4.cpp in Sources */,
-				AB711F241481C35F009011C8 /* slot1_retail.cpp in Sources */,
 				AB711F501481C35F009011C8 /* slot1_retail_nand.cpp in Sources */,
 				AB711F251481C35F009011C8 /* slot2_expMemory.cpp in Sources */,
 				AB711F261481C35F009011C8 /* slot2_gbagame.cpp in Sources */,
@@ -3352,6 +3393,11 @@
 				AB2145261714DFF4006DDB0F /* audiosamplegenerator.cpp in Sources */,
 				ABAAFBEA172122B6005DDDBE /* FileMigrationDelegate.mm in Sources */,
 				ABA93EB0178C7D4200CBF50B /* encrypt.cpp in Sources */,
+				AB4C808D17C5D7780024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C808E17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C808F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C809017C5D7780024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C80AA17C5D7A00024D479 /* advanscene.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3412,7 +3458,6 @@
 				AB73A9EB1507C9F500A310C8 /* slot1.cpp in Sources */,
 				AB73A9EC1507C9F500A310C8 /* slot1_none.cpp in Sources */,
 				AB73A9ED1507C9F500A310C8 /* slot1_r4.cpp in Sources */,
-				AB73A9EE1507C9F500A310C8 /* slot1_retail.cpp in Sources */,
 				AB73A9EF1507C9F500A310C8 /* slot1_retail_nand.cpp in Sources */,
 				AB73A9F01507C9F500A310C8 /* slot2_expMemory.cpp in Sources */,
 				AB73A9F11507C9F500A310C8 /* slot2_gbagame.cpp in Sources */,
@@ -3513,6 +3558,11 @@
 				AB2145251714DFF4006DDB0F /* audiosamplegenerator.cpp in Sources */,
 				ABAAFBED172122B6005DDDBE /* FileMigrationDelegate.mm in Sources */,
 				ABA93EB3178C7D4200CBF50B /* encrypt.cpp in Sources */,
+				AB4C809917C5D7780024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C809A17C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C809B17C5D7780024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C809C17C5D7780024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C80AD17C5D7A00024D479 /* advanscene.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3573,7 +3623,6 @@
 				ABAD0FF315ACE7A00000EC47 /* slot1.cpp in Sources */,
 				ABAD0FF415ACE7A00000EC47 /* slot1_none.cpp in Sources */,
 				ABAD0FF515ACE7A00000EC47 /* slot1_r4.cpp in Sources */,
-				ABAD0FF615ACE7A00000EC47 /* slot1_retail.cpp in Sources */,
 				ABAD0FF715ACE7A00000EC47 /* slot1_retail_nand.cpp in Sources */,
 				ABAD0FF815ACE7A00000EC47 /* slot2_expMemory.cpp in Sources */,
 				ABAD0FF915ACE7A00000EC47 /* slot2_gbagame.cpp in Sources */,
@@ -3644,6 +3693,11 @@
 				AB2145231714DFF4006DDB0F /* audiosamplegenerator.cpp in Sources */,
 				ABAAFBEC172122B6005DDDBE /* FileMigrationDelegate.mm in Sources */,
 				ABA93EB2178C7D4200CBF50B /* encrypt.cpp in Sources */,
+				AB4C809517C5D7780024D479 /* slot1_retail_auto.cpp in Sources */,
+				AB4C809617C5D7780024D479 /* slot1_retail_mcrom.cpp in Sources */,
+				AB4C809717C5D7780024D479 /* slot1comp_mc.cpp in Sources */,
+				AB4C809817C5D7780024D479 /* slot1comp_rom.cpp in Sources */,
+				AB4C80AC17C5D7A00024D479 /* advanscene.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj

@@ -323,7 +323,6 @@
 		AB796D2815CDCBA200C59155 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		AB796D2915CDCBA200C59155 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB796D2A15CDCBA200C59155 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB796D2B15CDCBA200C59155 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB796D2C15CDCBA200C59155 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB796D2D15CDCBA200C59155 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB796D2E15CDCBA200C59155 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -424,7 +423,6 @@
 		ABB3C6781501C04F00E0C22E /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		ABB3C6791501C04F00E0C22E /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
 		ABB3C67A1501C04F00E0C22E /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
-		ABB3C67B1501C04F00E0C22E /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		ABB3C67C1501C04F00E0C22E /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		ABB3C67D1501C04F00E0C22E /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
 		ABB3C67E1501C04F00E0C22E /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */; };
@@ -578,7 +576,6 @@
 		ABD1FEFE1345AC8400AF11D1 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		ABD1FF0B1345AC9C00AF11D1 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		ABD1FF0C1345AC9C00AF11D1 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		ABD1FF0D1345AC9C00AF11D1 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		ABD1FF0E1345AC9C00AF11D1 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		ABD1FF0F1345AC9C00AF11D1 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
 		ABD1FF101345AC9C00AF11D1 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */; };
@@ -637,6 +634,21 @@
 		ABFE150B14C92FF5005D6699 /* hq4x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE150014C92FF5005D6699 /* hq4x.cpp */; };
 		ABFE150D14C92FF5005D6699 /* lq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE150414C92FF5005D6699 /* lq2x.cpp */; };
 		ABFE150E14C92FF5005D6699 /* scanline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE150614C92FF5005D6699 /* scanline.cpp */; };
+		ABFE7C8217C5CFE70028DC56 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8117C5CFE70028DC56 /* advanscene.cpp */; };
+		ABFE7C8317C5CFE70028DC56 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8117C5CFE70028DC56 /* advanscene.cpp */; };
+		ABFE7C8417C5CFE70028DC56 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8117C5CFE70028DC56 /* advanscene.cpp */; };
+		ABFE7C8B17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8717C5D03C0028DC56 /* slot1_retail_auto.cpp */; };
+		ABFE7C8C17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8717C5D03C0028DC56 /* slot1_retail_auto.cpp */; };
+		ABFE7C8D17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8717C5D03C0028DC56 /* slot1_retail_auto.cpp */; };
+		ABFE7C8E17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */; };
+		ABFE7C8F17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */; };
+		ABFE7C9017C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */; };
+		ABFE7C9117C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */; };
+		ABFE7C9217C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */; };
+		ABFE7C9317C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */; };
+		ABFE7C9417C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */; };
+		ABFE7C9517C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */; };
+		ABFE7C9617C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -982,7 +994,6 @@
 		ABD1FECF1345AC8400AF11D1 /* wifi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wifi.cpp; path = ../wifi.cpp; sourceTree = SOURCE_ROOT; };
 		ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_none.cpp; sourceTree = "<group>"; };
 		ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_r4.cpp; sourceTree = "<group>"; };
-		ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail.cpp; sourceTree = "<group>"; };
 		ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_expMemory.cpp; sourceTree = "<group>"; };
 		ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_gbagame.cpp; sourceTree = "<group>"; };
 		ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_guitarGrip.cpp; sourceTree = "<group>"; };
@@ -1082,6 +1093,14 @@
 		ABFE150414C92FF5005D6699 /* lq2x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lq2x.cpp; sourceTree = "<group>"; };
 		ABFE150514C92FF5005D6699 /* lq2x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lq2x.h; sourceTree = "<group>"; };
 		ABFE150614C92FF5005D6699 /* scanline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scanline.cpp; sourceTree = "<group>"; };
+		ABFE7C8017C5CFE70028DC56 /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; };
+		ABFE7C8117C5CFE70028DC56 /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; };
+		ABFE7C8517C5D03C0028DC56 /* slot1comp_mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_mc.h; sourceTree = "<group>"; };
+		ABFE7C8617C5D03C0028DC56 /* slot1comp_rom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_rom.h; sourceTree = "<group>"; };
+		ABFE7C8717C5D03C0028DC56 /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; };
+		ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_mcrom.cpp; sourceTree = "<group>"; };
+		ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_mc.cpp; sourceTree = "<group>"; };
+		ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_rom.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1598,8 +1617,11 @@
 			children = (
 				ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */,
 				ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */,
+				ABFE7C8717C5D03C0028DC56 /* slot1_retail_auto.cpp */,
+				ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */,
 				AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */,
-				ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */,
+				ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */,
+				ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */,
 				ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */,
 				ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */,
 				ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */,
@@ -1608,6 +1630,8 @@
 				ABD1FF081345AC9C00AF11D1 /* slot2_paddle.cpp */,
 				ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */,
 				ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */,
+				ABFE7C8517C5D03C0028DC56 /* slot1comp_mc.h */,
+				ABFE7C8617C5D03C0028DC56 /* slot1comp_rom.h */,
 			);
 			name = addons;
 			path = ../addons;
@@ -1630,6 +1654,7 @@
 				ABD1FF211345ACBF00AF11D1 /* decrypt */,
 				ABD1FF2E1345ACBF00AF11D1 /* libfat */,
 				ABE670241415DE6C00E8E4C9 /* tinyxml */,
+				ABFE7C8117C5CFE70028DC56 /* advanscene.cpp */,
 				ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */,
 				ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */,
 				ABD1FF281345ACBF00AF11D1 /* dlditool.cpp */,
@@ -1639,6 +1664,7 @@
 				ABD1FF4C1345ACBF00AF11D1 /* task.cpp */,
 				ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */,
 				ABD1FF511345ACBF00AF11D1 /* xstring.cpp */,
+				ABFE7C8017C5CFE70028DC56 /* advanscene.h */,
 				ABD1FF1E1345ACBF00AF11D1 /* ConvertUTF.h */,
 				ABD1FF201345ACBF00AF11D1 /* datetime.h */,
 				ABD1FF2A1345ACBF00AF11D1 /* emufat.h */,
@@ -2197,7 +2223,6 @@
 				ABD1FEF81345AC8400AF11D1 /* slot1.cpp in Sources */,
 				ABD1FF0B1345AC9C00AF11D1 /* slot1_none.cpp in Sources */,
 				ABD1FF0C1345AC9C00AF11D1 /* slot1_r4.cpp in Sources */,
-				ABD1FF0D1345AC9C00AF11D1 /* slot1_retail.cpp in Sources */,
 				AB6FBEF6139B6258007BB045 /* slot1_retail_nand.cpp in Sources */,
 				ABD1FF0E1345AC9C00AF11D1 /* slot2_expMemory.cpp in Sources */,
 				ABD1FF0F1345AC9C00AF11D1 /* slot2_gbagame.cpp in Sources */,
@@ -2294,6 +2319,11 @@
 				ABD10AEB1715FCDD00B5729D /* mic_ext.cpp in Sources */,
 				ABD42048172319D1006A9B46 /* FileMigrationDelegate.mm in Sources */,
 				ABD798C9178C7B9000089F19 /* encrypt.cpp in Sources */,
+				ABFE7C8317C5CFE70028DC56 /* advanscene.cpp in Sources */,
+				ABFE7C8C17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */,
+				ABFE7C8F17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */,
+				ABFE7C9217C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */,
+				ABFE7C9517C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2361,7 +2391,6 @@
 				AB796D2815CDCBA200C59155 /* slot1.cpp in Sources */,
 				AB796D2915CDCBA200C59155 /* slot1_none.cpp in Sources */,
 				AB796D2A15CDCBA200C59155 /* slot1_r4.cpp in Sources */,
-				AB796D2B15CDCBA200C59155 /* slot1_retail.cpp in Sources */,
 				AB796D2C15CDCBA200C59155 /* slot1_retail_nand.cpp in Sources */,
 				AB796D2D15CDCBA200C59155 /* slot2_expMemory.cpp in Sources */,
 				AB796D2E15CDCBA200C59155 /* slot2_gbagame.cpp in Sources */,
@@ -2456,6 +2485,11 @@
 				ABD10AEA1715FCDD00B5729D /* mic_ext.cpp in Sources */,
 				ABD42047172319D1006A9B46 /* FileMigrationDelegate.mm in Sources */,
 				ABD798C8178C7B9000089F19 /* encrypt.cpp in Sources */,
+				ABFE7C8217C5CFE70028DC56 /* advanscene.cpp in Sources */,
+				ABFE7C8B17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */,
+				ABFE7C8E17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */,
+				ABFE7C9117C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */,
+				ABFE7C9417C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2473,7 +2507,6 @@
 				ABB3C6781501C04F00E0C22E /* slot1_none.cpp in Sources */,
 				ABB3C6791501C04F00E0C22E /* slot1_r4.cpp in Sources */,
 				ABB3C67A1501C04F00E0C22E /* slot1_retail_nand.cpp in Sources */,
-				ABB3C67B1501C04F00E0C22E /* slot1_retail.cpp in Sources */,
 				ABB3C67C1501C04F00E0C22E /* slot2_expMemory.cpp in Sources */,
 				ABB3C67D1501C04F00E0C22E /* slot2_gbagame.cpp in Sources */,
 				ABB3C67E1501C04F00E0C22E /* slot2_guitarGrip.cpp in Sources */,
@@ -2607,6 +2640,11 @@
 				AB5785F817175F16002C5FC7 /* cocoa_core.mm in Sources */,
 				AB5785F9171760D2002C5FC7 /* cocoa_output.mm in Sources */,
 				ABD798CA178C7B9000089F19 /* encrypt.cpp in Sources */,
+				ABFE7C8417C5CFE70028DC56 /* advanscene.cpp in Sources */,
+				ABFE7C8D17C5D03C0028DC56 /* slot1_retail_auto.cpp in Sources */,
+				ABFE7C9017C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */,
+				ABFE7C9317C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */,
+				ABFE7C9617C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj

@@ -323,7 +323,6 @@
 		AB796D2815CDCBA200C59155 /* slot1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC91345AC8400AF11D1 /* slot1.cpp */; };
 		AB796D2915CDCBA200C59155 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		AB796D2A15CDCBA200C59155 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		AB796D2B15CDCBA200C59155 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		AB796D2C15CDCBA200C59155 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB796D2D15CDCBA200C59155 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		AB796D2E15CDCBA200C59155 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
@@ -393,6 +392,21 @@
 		AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; };
 		AB8967DE16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; };
 		AB901BDE1420706100348EEC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AB901BDD1420706100348EEC /* Localizable.strings */; };
+		AB9038A617C5ECFD00F410BD /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A517C5ECFD00F410BD /* advanscene.cpp */; };
+		AB9038A717C5ECFD00F410BD /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A517C5ECFD00F410BD /* advanscene.cpp */; };
+		AB9038A817C5ECFD00F410BD /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A517C5ECFD00F410BD /* advanscene.cpp */; };
+		AB9038AF17C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */; };
+		AB9038B017C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */; };
+		AB9038B117C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */; };
+		AB9038B217C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */; };
+		AB9038B317C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */; };
+		AB9038B417C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */; };
+		AB9038B517C5ED2200F410BD /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */; };
+		AB9038B617C5ED2200F410BD /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */; };
+		AB9038B717C5ED2200F410BD /* slot1comp_mc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */; };
+		AB9038B817C5ED2200F410BD /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */; };
+		AB9038B917C5ED2200F410BD /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */; };
+		AB9038BA17C5ED2200F410BD /* slot1comp_rom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */; };
 		AB91D46B13BD013800462471 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		ABA6574B14511EC90077E5E9 /* cocoa_cheat.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */; };
 		ABACB8DC1710B621003B845D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABACB8DB1710B621003B845D /* AudioToolbox.framework */; };
@@ -424,7 +438,6 @@
 		ABB3C6781501C04F00E0C22E /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		ABB3C6791501C04F00E0C22E /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
 		ABB3C67A1501C04F00E0C22E /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
-		ABB3C67B1501C04F00E0C22E /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		ABB3C67C1501C04F00E0C22E /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		ABB3C67D1501C04F00E0C22E /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
 		ABB3C67E1501C04F00E0C22E /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */; };
@@ -581,7 +594,6 @@
 		ABD1FEFE1345AC8400AF11D1 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		ABD1FF0B1345AC9C00AF11D1 /* slot1_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */; };
 		ABD1FF0C1345AC9C00AF11D1 /* slot1_r4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */; };
-		ABD1FF0D1345AC9C00AF11D1 /* slot1_retail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */; };
 		ABD1FF0E1345AC9C00AF11D1 /* slot2_expMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */; };
 		ABD1FF0F1345AC9C00AF11D1 /* slot2_gbagame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */; };
 		ABD1FF101345AC9C00AF11D1 /* slot2_guitarGrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */; };
@@ -823,6 +835,14 @@
 		AB901BE21420707800348EEC /* Chinese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Chinese; path = translations/Chinese.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB901BE31420707D00348EEC /* Norwegian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Norwegian; path = translations/Norwegian.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB901BE41420708200348EEC /* Romanian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Romanian; path = translations/Romanian.lproj/Localizable.strings; sourceTree = "<group>"; };
+		AB9038A417C5ECFD00F410BD /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; };
+		AB9038A517C5ECFD00F410BD /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; };
+		AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; };
+		AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_mcrom.cpp; sourceTree = "<group>"; };
+		AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_mc.cpp; sourceTree = "<group>"; };
+		AB9038AC17C5ED2200F410BD /* slot1comp_mc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_mc.h; sourceTree = "<group>"; };
+		AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_rom.cpp; sourceTree = "<group>"; };
+		AB9038AE17C5ED2200F410BD /* slot1comp_rom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_rom.h; sourceTree = "<group>"; };
 		AB9971CE134EDA0800531BA7 /* cocoa_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_globals.h; sourceTree = "<group>"; };
 		ABA6574914511EC90077E5E9 /* cocoa_cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_cheat.h; sourceTree = "<group>"; };
 		ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_cheat.mm; sourceTree = "<group>"; };
@@ -984,7 +1004,6 @@
 		ABD1FECF1345AC8400AF11D1 /* wifi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wifi.cpp; path = ../wifi.cpp; sourceTree = SOURCE_ROOT; };
 		ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_none.cpp; sourceTree = "<group>"; };
 		ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_r4.cpp; sourceTree = "<group>"; };
-		ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail.cpp; sourceTree = "<group>"; };
 		ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_expMemory.cpp; sourceTree = "<group>"; };
 		ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_gbagame.cpp; sourceTree = "<group>"; };
 		ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_guitarGrip.cpp; sourceTree = "<group>"; };
@@ -1598,8 +1617,11 @@
 			children = (
 				ABD1FF001345AC9B00AF11D1 /* slot1_none.cpp */,
 				ABD1FF011345AC9B00AF11D1 /* slot1_r4.cpp */,
+				AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */,
+				AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */,
 				AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */,
-				ABD1FF021345AC9B00AF11D1 /* slot1_retail.cpp */,
+				AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */,
+				AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */,
 				ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */,
 				ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */,
 				ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */,
@@ -1608,6 +1630,8 @@
 				ABD1FF081345AC9C00AF11D1 /* slot2_paddle.cpp */,
 				ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */,
 				ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */,
+				AB9038AC17C5ED2200F410BD /* slot1comp_mc.h */,
+				AB9038AE17C5ED2200F410BD /* slot1comp_rom.h */,
 			);
 			name = addons;
 			path = ../addons;
@@ -1630,6 +1654,7 @@
 				ABD1FF211345ACBF00AF11D1 /* decrypt */,
 				ABD1FF2E1345ACBF00AF11D1 /* libfat */,
 				ABE670241415DE6C00E8E4C9 /* tinyxml */,
+				AB9038A517C5ECFD00F410BD /* advanscene.cpp */,
 				ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */,
 				ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */,
 				ABD1FF281345ACBF00AF11D1 /* dlditool.cpp */,
@@ -1639,6 +1664,7 @@
 				ABD1FF4C1345ACBF00AF11D1 /* task.cpp */,
 				ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */,
 				ABD1FF511345ACBF00AF11D1 /* xstring.cpp */,
+				AB9038A417C5ECFD00F410BD /* advanscene.h */,
 				ABD1FF1E1345ACBF00AF11D1 /* ConvertUTF.h */,
 				ABD1FF201345ACBF00AF11D1 /* datetime.h */,
 				ABD1FF2A1345ACBF00AF11D1 /* emufat.h */,
@@ -2197,7 +2223,6 @@
 				ABD1FEF81345AC8400AF11D1 /* slot1.cpp in Sources */,
 				ABD1FF0B1345AC9C00AF11D1 /* slot1_none.cpp in Sources */,
 				ABD1FF0C1345AC9C00AF11D1 /* slot1_r4.cpp in Sources */,
-				ABD1FF0D1345AC9C00AF11D1 /* slot1_retail.cpp in Sources */,
 				AB6FBEF6139B6258007BB045 /* slot1_retail_nand.cpp in Sources */,
 				ABCFA9F5178BDE920030C8BA /* encrypt.cpp in Sources */,
 				ABD1FF0E1345AC9C00AF11D1 /* slot2_expMemory.cpp in Sources */,
@@ -2211,6 +2236,7 @@
 				ABD1041F1346652500AF11D1 /* sndOSX.cpp in Sources */,
 				AB1F468413A0ADE400B80DE6 /* SndOut.cpp in Sources */,
 				ABAD3E7813AF1D6D00502E1E /* SoundTouch.cpp in Sources */,
+				AB9038B017C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */,
 				ABD1FEFA1345AC8400AF11D1 /* SPU.cpp in Sources */,
 				ABAD3E7913AF1D6D00502E1E /* sse_optimized.cpp in Sources */,
 				ABD1FF671345ACBF00AF11D1 /* task.cpp in Sources */,
@@ -2219,6 +2245,7 @@
 				ABD1FEFC1345AC8400AF11D1 /* thumb_instructions.cpp in Sources */,
 				AB1F469813A0AE2F00B80DE6 /* Timestretcher.cpp in Sources */,
 				ABE6702B1415DE6C00E8E4C9 /* tinystr.cpp in Sources */,
+				AB9038B617C5ED2200F410BD /* slot1comp_mc.cpp in Sources */,
 				ABE6702C1415DE6C00E8E4C9 /* tinyxml.cpp in Sources */,
 				ABE6702D1415DE6C00E8E4C9 /* tinyxmlerror.cpp in Sources */,
 				ABE6702E1415DE6C00E8E4C9 /* tinyxmlparser.cpp in Sources */,
@@ -2227,6 +2254,7 @@
 				ABE5DE95143F781900835AD8 /* videofilter.cpp in Sources */,
 				ABAD3E7B13AF1D6D00502E1E /* WavFile.cpp in Sources */,
 				ABD1FEFE1345AC8400AF11D1 /* wifi.cpp in Sources */,
+				AB9038B317C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */,
 				ABD1FF691345ACBF00AF11D1 /* xstring.cpp in Sources */,
 				ABD104281346653B00AF11D1 /* main.m in Sources */,
 				ABA6574B14511EC90077E5E9 /* cocoa_cheat.mm in Sources */,
@@ -2248,6 +2276,7 @@
 				ABFE150914C92FF5005D6699 /* epx.cpp in Sources */,
 				ABFE150A14C92FF5005D6699 /* hq2x.cpp in Sources */,
 				ABFE150B14C92FF5005D6699 /* hq4x.cpp in Sources */,
+				AB9038A717C5ECFD00F410BD /* advanscene.cpp in Sources */,
 				ABFE150D14C92FF5005D6699 /* lq2x.cpp in Sources */,
 				ABFE150E14C92FF5005D6699 /* scanline.cpp in Sources */,
 				AB1B9E631501A78000464647 /* coreaudiosound.cpp in Sources */,
@@ -2287,6 +2316,7 @@
 				AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */,
 				AB3A655F16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
 				AB3A656216CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
+				AB9038B917C5ED2200F410BD /* slot1comp_rom.cpp in Sources */,
 				AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */,
 				AB29B33216D4BEBF000EF671 /* InputManager.mm in Sources */,
 				AB82445C1704AE9A00B8EE20 /* utilities.c in Sources */,
@@ -2310,6 +2340,7 @@
 				AB796CF515CDCBA200C59155 /* cache.cpp in Sources */,
 				AB796CF615CDCBA200C59155 /* cheatSystem.cpp in Sources */,
 				AB796CF715CDCBA200C59155 /* common.cpp in Sources */,
+				AB9038B517C5ED2200F410BD /* slot1comp_mc.cpp in Sources */,
 				AB796CF815CDCBA200C59155 /* cp15.cpp in Sources */,
 				AB796CF915CDCBA200C59155 /* cpu_detect_x86_gcc.cpp in Sources */,
 				AB796CFA15CDCBA200C59155 /* crc.cpp in Sources */,
@@ -2322,6 +2353,7 @@
 				AB796D0115CDCBA200C59155 /* dlditool.cpp in Sources */,
 				AB796D0215CDCBA200C59155 /* driver.cpp in Sources */,
 				AB796D0315CDCBA200C59155 /* emufat.cpp in Sources */,
+				AB9038B217C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */,
 				AB796D0415CDCBA200C59155 /* emufile.cpp in Sources */,
 				AB796D0515CDCBA200C59155 /* fatdir.cpp in Sources */,
 				AB796D0615CDCBA200C59155 /* fatfile.cpp in Sources */,
@@ -2334,6 +2366,7 @@
 				AB796D0D15CDCBA200C59155 /* fs-linux.cpp in Sources */,
 				AB796D0E15CDCBA200C59155 /* gfx3d.cpp in Sources */,
 				AB796D0F15CDCBA200C59155 /* GPU.cpp in Sources */,
+				AB9038AF17C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */,
 				AB796D1015CDCBA200C59155 /* GPU_osd_stub.cpp in Sources */,
 				AB796D1115CDCBA200C59155 /* guid.cpp in Sources */,
 				AB796D1215CDCBA200C59155 /* header.cpp in Sources */,
@@ -2347,6 +2380,7 @@
 				AB796D1A15CDCBA200C59155 /* MMU.cpp in Sources */,
 				AB796D1B15CDCBA200C59155 /* mmx_optimized.cpp in Sources */,
 				AB796D1C15CDCBA200C59155 /* movie.cpp in Sources */,
+				AB9038B817C5ED2200F410BD /* slot1comp_rom.cpp in Sources */,
 				AB796D1D15CDCBA200C59155 /* NDSSystem.cpp in Sources */,
 				AB796D1E15CDCBA200C59155 /* OGLRender.cpp in Sources */,
 				AB796D1F15CDCBA200C59155 /* partition.cpp in Sources */,
@@ -2361,7 +2395,6 @@
 				AB796D2815CDCBA200C59155 /* slot1.cpp in Sources */,
 				AB796D2915CDCBA200C59155 /* slot1_none.cpp in Sources */,
 				AB796D2A15CDCBA200C59155 /* slot1_r4.cpp in Sources */,
-				AB796D2B15CDCBA200C59155 /* slot1_retail.cpp in Sources */,
 				AB796D2C15CDCBA200C59155 /* slot1_retail_nand.cpp in Sources */,
 				AB796D2D15CDCBA200C59155 /* slot2_expMemory.cpp in Sources */,
 				AB796D2E15CDCBA200C59155 /* slot2_gbagame.cpp in Sources */,
@@ -2380,6 +2413,7 @@
 				AB796D3B15CDCBA200C59155 /* TDStretch.cpp in Sources */,
 				AB796D3C15CDCBA200C59155 /* texcache.cpp in Sources */,
 				AB796D3D15CDCBA200C59155 /* thumb_instructions.cpp in Sources */,
+				AB9038A617C5ECFD00F410BD /* advanscene.cpp in Sources */,
 				AB796D3E15CDCBA200C59155 /* Timestretcher.cpp in Sources */,
 				AB796D3F15CDCBA200C59155 /* tinystr.cpp in Sources */,
 				AB796D4015CDCBA200C59155 /* tinyxml.cpp in Sources */,
@@ -2472,9 +2506,9 @@
 				ABB3C6761501C04F00E0C22E /* cocoa_util.mm in Sources */,
 				ABB3C6771501C04F00E0C22E /* cocoa_videofilter.mm in Sources */,
 				ABB3C6781501C04F00E0C22E /* slot1_none.cpp in Sources */,
+				AB9038B417C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */,
 				ABB3C6791501C04F00E0C22E /* slot1_r4.cpp in Sources */,
 				ABB3C67A1501C04F00E0C22E /* slot1_retail_nand.cpp in Sources */,
-				ABB3C67B1501C04F00E0C22E /* slot1_retail.cpp in Sources */,
 				ABB3C67C1501C04F00E0C22E /* slot2_expMemory.cpp in Sources */,
 				ABB3C67D1501C04F00E0C22E /* slot2_gbagame.cpp in Sources */,
 				ABB3C67E1501C04F00E0C22E /* slot2_guitarGrip.cpp in Sources */,
@@ -2493,6 +2527,7 @@
 				ABB3C68B1501C04F00E0C22E /* AAFilter.cpp in Sources */,
 				ABB3C68C1501C04F00E0C22E /* cpu_detect_x86_gcc.cpp in Sources */,
 				ABB3C68D1501C04F00E0C22E /* FIFOSampleBuffer.cpp in Sources */,
+				AB9038A817C5ECFD00F410BD /* advanscene.cpp in Sources */,
 				ABB3C68E1501C04F00E0C22E /* FIRFilter.cpp in Sources */,
 				ABB3C68F1501C04F00E0C22E /* mmx_optimized.cpp in Sources */,
 				ABB3C6901501C04F00E0C22E /* RateTransposer.cpp in Sources */,
@@ -2523,6 +2558,7 @@
 				ABB3C6A91501C04F00E0C22E /* tinyxmlparser.cpp in Sources */,
 				ABB3C6AA1501C04F00E0C22E /* ConvertUTF.c in Sources */,
 				ABB3C6AB1501C04F00E0C22E /* datetime.cpp in Sources */,
+				AB9038B117C5ED2200F410BD /* slot1_retail_auto.cpp in Sources */,
 				ABB3C6AC1501C04F00E0C22E /* dlditool.cpp in Sources */,
 				ABB3C6AD1501C04F00E0C22E /* emufat.cpp in Sources */,
 				ABB3C6AE1501C04F00E0C22E /* guid.cpp in Sources */,
@@ -2562,6 +2598,7 @@
 				ABB3C6D11501C04F00E0C22E /* slot1.cpp in Sources */,
 				ABB3C6D31501C04F00E0C22E /* SPU.cpp in Sources */,
 				ABB3C6D41501C04F00E0C22E /* texcache.cpp in Sources */,
+				AB9038BA17C5ED2200F410BD /* slot1comp_rom.cpp in Sources */,
 				ABB3C6D51501C04F00E0C22E /* thumb_instructions.cpp in Sources */,
 				ABB3C6D61501C04F00E0C22E /* version.cpp in Sources */,
 				ABB3C6D71501C04F00E0C22E /* wifi.cpp in Sources */,
@@ -2598,6 +2635,7 @@
 				AB405692169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405695169F5DCC0016AC3E /* x86util.cpp in Sources */,
 				AB68A0DD16B139BC00DE0546 /* OGLRender_3_2.cpp in Sources */,
+				AB9038B717C5ED2200F410BD /* slot1comp_mc.cpp in Sources */,
 				AB3A656316CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 				AB82445D1704AE9A00B8EE20 /* utilities.c in Sources */,
 				AB010060170D07B000D70FBE /* InputProfileController.mm in Sources */,

desmume/src/cocoa/cocoa_core.mm

@@ -99,7 +99,7 @@ static BOOL isCoreStarted = NO;
 	emuFlagDebugConsole = NO;
 	emuFlagEmulateEnsata = NO;
 	
-	slot1DeviceType = NDS_SLOT1_RETAIL;
+	slot1DeviceType = NDS_SLOT1_RETAIL_AUTO;
 	slot1StatusText = NSSTRING_STATUS_EMULATION_NOT_RUNNING;
 	
 	spinlockMasterExecute = OS_SPINLOCK_INIT;
@@ -687,7 +687,7 @@ static BOOL isCoreStarted = NO;
 			[self setSlot1StatusText:NSSTRING_STATUS_SLOT1_NO_DEVICE];
 			break;
 			
-		case NDS_SLOT1_RETAIL:
+		case NDS_SLOT1_RETAIL_AUTO:
 			[self setSlot1StatusText:NSSTRING_STATUS_SLOT1_RETAIL_INSERTED];
 			break;
 			
@@ -699,6 +699,10 @@ static BOOL isCoreStarted = NO;
 			[self setSlot1StatusText:NSSTRING_STATUS_SLOT1_R4_INSERTED];
 			break;
 			
+		case NDS_SLOT1_RETAIL_MCROM:
+			[self setSlot1StatusText:NSSTRING_STATUS_SLOT1_STANDARD_INSERTED];
+			break;
+			
 		default:
 			[self setSlot1StatusText:NSSTRING_STATUS_SLOT1_UNKNOWN_STATE];
 			break;

desmume/src/cocoa/cocoa_globals.h

@@ -102,9 +102,10 @@
 #define NSSTRING_STATUS_EMULATION_NOT_RUNNING		NSLocalizedString(@"Emulation is not running.", nil)
 #define NSSTRING_STATUS_SLOT1_UNKNOWN_STATE			NSLocalizedString(@"Unknown state.", nil)
 #define NSSTRING_STATUS_SLOT1_NO_DEVICE				NSLocalizedString(@"No device inserted.", nil)
-#define NSSTRING_STATUS_SLOT1_RETAIL_INSERTED		NSLocalizedString(@"Retail cartridge inserted.", nil)
+#define NSSTRING_STATUS_SLOT1_RETAIL_INSERTED		NSLocalizedString(@"Retail cartridge inserted. (Auto-detect)", nil)
-#define NSSTRING_STATUS_SLOT1_RETAIL_NAND_INSERTED	NSLocalizedString(@"Retail cartridge (with NAND flash) inserted.", nil)
+#define NSSTRING_STATUS_SLOT1_RETAIL_NAND_INSERTED	NSLocalizedString(@"Retail cartridge w/ NAND flash inserted.", nil)
 #define NSSTRING_STATUS_SLOT1_R4_INSERTED			NSLocalizedString(@"R4 cartridge interface inserted.", nil)
+#define NSSTRING_STATUS_SLOT1_STANDARD_INSERTED		NSLocalizedString(@"Standard retail cartridge inserted.", nil)
 
 #define NSSTRING_DISPLAYMODE_MAIN					NSLocalizedString(@"Main", nil)
 #define NSSTRING_DISPLAYMODE_TOUCH					NSLocalizedString(@"Touch", nil)

desmume/src/utils/advanscene.cpp

@@ -19,7 +19,7 @@
 #include <time.h>
 
 #define TIXML_USE_STL
-#include "utils/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 
 #include "advanscene.h"
 #include "mc.h"