From: slack <slack@0666ae3d-8926-0410-aeff-ae84559ff337>
Date: Sun, 19 Aug 2007 16:16:30 +0000 (+0000)
Subject: retoques en el log de cabeceras de roms
X-Git-Tag: v0.1~68
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=5bafe35947a47b3e10df73bafe5fd63e451265aa;p=wenboi.git

retoques en el log de cabeceras de roms

git-svn-id: http://slack.codemaniacs.com/wenboi@11 0666ae3d-8926-0410-aeff-ae84559ff337
---

diff --git a/GBRom.cc b/GBRom.cc
index b792a2a..7ebd8da 100644
--- a/GBRom.cc
+++ b/GBRom.cc
@@ -15,23 +15,35 @@ void log_rom_header(GBRom *rom, Logger::log_level level)
 {
 	std::ostringstream out;
 
+	out << "Logging ROM header data:" << endl;
+
 	out << std::hex << std::right << std::setfill('0');
 	out << "Entrypoint: 0x" << rom->header.entry_point << endl;
-	out << "New licensee code: 0x" << std::setw(2) << 
-		int(rom->header.new_licensee_code[0]) << std::setw(2) << 
-		int(rom->header.new_licensee_code[1]) << endl;
 
-	out << "SGB flag: " << int(rom->header.sgb_flag) << endl;
+	out << "SGB flag: "       << int(rom->header.sgb_flag) << endl;
 	out << "Cartridge type: " << int(rom->header.cartridge_type) << endl;
 	out << std::dec;
 	out << "ROM size: " << (32 << int(rom->header.rom_size)) << "K" << endl;
 	out << "RAM size: " << int(rom->header.ram_size) << endl;
-	out << "Destination code: " << int(rom->header.destination_code) << endl;
-	out << "Old licensee code: " << int(rom->header.old_licensee_code) << endl;
-	out << "Mask ROM version number: " << int(rom->header.mask_rom_version_number) << endl;
 	out << std::hex;
-	out << "Header checksum: " << std::setw(2) << int(rom->header.header_checksum) << endl;
-	out << "Global checksum: " << std::setw(2) << 
+	out << "Destination code: 0x"        << std::setw(2) << int(rom->header.destination_code) << endl;
+	if (rom->header.old_licensee_code == 0x33) {
+		out << "-- ROM uses new licensee code field --" << endl;
+		out << "New licensee code: 0x" << std::setw(2) << 
+			int(rom->header.new_licensee_code[0]) << std::setw(2) << 
+			int(rom->header.new_licensee_code[1]) << endl;
+	} else {
+		out << "Old licensee code: 0x"       << std::setw(2) << int(rom->header.old_licensee_code) << endl;
+	}
+	if (rom->header.cgb_flag == 0x80)
+		out << "-- ROM supports Color GameBoy functions --" << endl;
+
+	if (rom->header.cgb_flag == 0xC0)
+		out << "-- ROM is for Color GameBoy only --" << endl;
+
+	out << "Mask ROM version number: 0x" << std::setw(2) << int(rom->header.mask_rom_version_number) << endl;
+	out << "Header checksum: 0x"         << std::setw(2) << int(rom->header.header_checksum) << endl;
+	out << "Global checksum: 0x"         << std::setw(2) << 
 		int(rom->header.global_checksum[0]) << std::setw(2) <<  
 		int(rom->header.global_checksum[1]) << endl;
 
diff --git a/Makefile b/Makefile
index c6e4bcd..63c4f39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CXXFLAGS=-g -Wall -Weffc++ -Wstrict-null-sentinel -Wold-style-cast \
 	 -Woverloaded-virtual 
 
-all: gbcore.o MBC.o GBMemory.o Logger.o GBRom.o
+all: gbcore.o MBC.o GBMemory.o Logger.o GBRom.o tests
 
 tests: tests/test_gbrom