M src/gba/gba-memory.c → src/gba/gba-memory.c

@@ -109,6 +109,10 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
 	struct GBA* gba = (struct GBA*) cpu->master;
 	struct GBAMemory* memory = &gba->memory;
 
+	if (address == gba->busyLoop && memory->activeRegion != REGION_BIOS) {
+		GBAHalt(gba);
+	}
+
 	int newRegion = address >> BASE_OFFSET;
 	if (newRegion == memory->activeRegion) {
 		return;

M src/gba/gba.c → src/gba/gba.c

@@ -42,8 +42,11 @@ // Drill Dozer
 	{ "V49J", SAVEDATA_SRAM, GPIO_RUMBLE, -1 },
 	{ "V49E", SAVEDATA_SRAM, GPIO_RUMBLE, -1 },
 
+	// Final Fantasy Tactics Advance
+	{ "AFXE", SAVEDATA_FLASH512, GPIO_NONE, 0x8000418 },
+
 	// Mega Man Battle Network
-	{ "AREE", SAVEDATA_SRAM, GPIO_NONE, 0x8000338 },
+	{ "AREE", SAVEDATA_SRAM, GPIO_NONE, 0x800032E },
 
 	// Pokemon Ruby
 	{ "AXVJ", SAVEDATA_FLASH1M, GPIO_RTC, -1 },