From 911e85cf7d23a593dec79bd1d4cbd5f6298dad80 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 24 Nov 2018 18:13:25 +0000 Subject: [PATCH] Update host/scripts/nes/mmc1.lua --- host/scripts/nes/mmc1.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/host/scripts/nes/mmc1.lua b/host/scripts/nes/mmc1.lua index f12cf5c..049e02a 100644 --- a/host/scripts/nes/mmc1.lua +++ b/host/scripts/nes/mmc1.lua @@ -561,14 +561,8 @@ local function process( test, read, erase, program, verify, dumpfile, flashfile, file = assert(io.open(dumpfile, "wb")) --dump cart into file -<<<<<<< HEAD - -- TODO: This varies depending on cart? - dump.dumptofile( file, 128, "MMC1", "PRGROM", true ) - dump.dumptofile( file, 32, "MMC1", "CHRROM", true ) -======= dump_prgrom(file, prg_size, false) dump_chrrom(file, chr_size, false) ->>>>>>> 7651f91a467c750b2d5415cddb428dd7fb548abe --close file assert(file:close())