Fixed page programming size (64, no 32)

2 files changed, 128 insertions, 129 deletions

diff --git a/dumper.c b/dumper.c
index 2b5bafe..4f61681 100644
--- a/dumper.c
+++ b/dumper.c
@@ -442,8 +442,8 @@ static void write_coolboy(uint16_t address, uint16_t len, uint8_t* data)
     uint16_t a = address;
     uint16_t last_address;
     uint8_t last_data;
-    uint16_t address_base = a & 0xFFE0;
-    while ((len > 0) && ((a & 0xFFE0) == address_base))
+    uint16_t address_base = a & 0xFFC0;
+    while ((len > 0) && ((a & 0xFFC0) == address_base))
     {
       if (*d != 0xFF)
         count++;
@@ -533,8 +533,8 @@ static void write_flash(uint16_t address, uint16_t len, uint8_t* data)
     uint16_t a = address;
     uint16_t last_address;
     uint8_t last_data;
-    uint16_t address_base = a & 0xFFE0;
-    while ((len > 0) && ((a & 0xFFE0) == address_base))
+    uint16_t address_base = a & 0xFFC0;
+    while ((len > 0) && ((a & 0xFFC0) == address_base))
     {
       if (*d != 0xFF)
         count++;
diff --git a/famicom-dumper.hex b/famicom-dumper.hex
index 883ea2b..5704a05 100644
--- a/famicom-dumper.hex
+++ b/famicom-dumper.hex
@@ -8,7 +8,7 @@
 :100070000C9458000C9458000C9458000C945800A0

 :100080000C9458000C9458000C94580011241FBE76

 :10009000CFEFD0E1DEBFCDBF29E0A0E0B1E001C0ED

-:1000A0001D92A531B207E1F70E9414030C94620877

+:1000A0001D92A531B207E1F70E9414030C945E087B

 :1000B0000C9400008BBB95BB95FD06C0809162003F

 :1000C0008061809362000895809162008F7E8093AA

 :1000D00062000895CF93DF93C2E6D0E028812E7F9F

@@ -102,20 +102,20 @@
 :1006500082BB11BA1BBA15BA909162009061909357

 :1006600062008ABB84BBBC98C498C798C6980E9495

 :100670000B0360E070E080E00E94390277247394FD

-:100680001EE6C12ED12C04E1402E512C66246A9422

+:10068000BEE6AB2EB12C14E1212E312C66246A94E7

 :100690008FB589628FBD21E02EBD20E030E0E0E023

 :1006A00041E050E060E070E080910B01811135C0C5

 :1006B0008FB589628FBD7EBC403187E258076105E6

 :1006C000710508F451C0E11154C0C90101968E367C

 :1006D00091050CF456C0E1E09C012456310939BD66

-:1006E00028BD9C01C601821B930B853191050CF03E

-:1006F0005AC08B30910524F0A201481B590BCA0146

+:1006E00028BD9C01C501821B930B853191050CF03F

+:1006F0005AC08B30910524F0A101481B590BCA0147

 :10070000880F991F909379008093780040E050E023

 :10071000BA0180910B01882359F210920B011092BB

 :1007200079001092780019BC18BC1FBC55E05EBD62

-:1007300080910C01833109F4BCC2C8F1853209F4FF

-:10074000DAC208F457C0873209F43AC408F42DC35A

-:10075000883209F4E1C38E3F09F09ACFF89414BEB1

+:1007300080910C01833109F4B9C2C8F1853209F402

+:10074000D7C208F457C0873209F436C408F42AC364

+:10075000883209F4DDC38E3F09F09ACFF89414BEB5

 :10076000E0E0F8EF099594CF4F5F5F4F6F4F7F4FF9

 :100770009BCF2150310989F4E0E040E050E0BA011C

 :1007800093CF8436910524F02356310939BD28BD15

@@ -125,146 +125,145 @@
 :1007C00009F41BC1853009F063CF65E070E080E07B

 :1007D0000E94390282E00E94610280E00E94610270

 :1007E00088E00E94610280E00E94610288E00E942D

-:1007F00061024ECF833209F410C208F038C1823250

+:1007F00061024ECF833209F40DC208F038C1823253

 :1008000009F046CF00910D0180910E0110E0182BE8

 :1008100030910F01398380911001432F50E0582B04

-:100820005A834983C69AC49AC39ABC9ABB9A69816F

-:100830007A8188E00E94390289819A81892B71F03E

-:10084000C8010E948A000E946102E981FA81319701

-:10085000FA83E9830F5F1F4FEF2B91F71BBA15BA8D

+:100820005C834B83C69AC49AC39ABC9ABB9A6B8169

+:100830007C8188E00E9439028B819C81892B71F038

+:10084000C8010E948A000E946102EB81FC813197FD

+:10085000FC83EB830F5F1F4FEF2B91F71BBA15BA89

 :10086000809162008061809362008091620082606A

 :1008700080936200C49AC39ABC98C498C69808CF63

 :100880008D30C9F18131A1F18B3009F001CF009198

-:100890000D0180910E0110E0182B30910F0139836A

-:1008A00080911001432F50E0582B5A834983C69AF8

-:1008B00069817A818CE00E94390289819A81892B31

-:1008C00071F0C8010E946A000E946102E981FA8108

-:1008D0003197FA83E9830F5F1F4FEF2B91F71BBA14

+:100890000D0180910E0110E0182BF0910F01F983EA

+:1008A000809110012F2F30E0382B3C832B83C69A88

+:1008B0006B817C818CE00E9439024B815C81452BED

+:1008C00071F0C8010E946A000E9461028B819C81C4

+:1008D00001979C838B830F5F1F4F892B91F71BBA66

 :1008E00015BA80916200806180936200C698D0CE74

 :1008F0000E949601CDCEE0900D0180910E01F12C69

-:10090000F82A50910F01598380911001E52FF0E0F2

-:10091000F82BFA83E983C79AEF2BD9F101E111E0B3

+:10090000F82A30910F01398380911001432F50E074

+:10091000582B5C834B83C79A452BD9F101E111E039

 :10092000F80191918F01809162008E7F8093620027

 :100930008091620082608093620061BA92BBC701BD

 :100940000E945A00809162008B7F80936200F2E0E7

 :10095000FA95F1F700C08091620084608093620094

 :1009600062BA11BA1BBA15BA809162008061809395

 :100970006200809162008160809362002FEFE21A32

-:10098000F20A49815A81415051095A834983452BC2

+:10098000F20A4B815C81415051095C834B83452BBA

 :1009900039F6C79860E070E08EE00E94390278CEA8

 :1009A000E0900D0180910E01F12CF82A20910F01A9

-:1009B000298380911001422F50E0582B5A8349839C

+:1009B000298380911001422F50E0582B5C834B8398

 :1009C000C79A452B99F001E111E0F80161918F017F

-:1009D000C7010E94E300FFEFEF1AFF0A29813A8165

-:1009E000215031093A832983232B79F7C79860E096

+:1009D000C7010E94E300FFEFEF1AFF0A2B813C8161

+:1009E000215031093C832B83232B79F7C79860E092

 :1009F00070E08AE00E9439024BCE00910D01809197

 :100A00000E0110E0182B80910F0189838091100155

-:100A1000F981EF2FF0E0F82BFA83E983C69A698118

-:100A20007A8188E00E94390229813A81232B09F4D6

-:100A300056CFC8010E9438010E94610249815A8143

-:100A4000415051095A8349830F5F1F4F452B89F746

+:100A1000F981EF2FF0E0F82BFC83EB83C69A6B8112

+:100A20007C8188E00E9439022B813C81232B09F4D0

+:100A300056CFC8010E9438010E9461024B815C813F

+:100A4000415051095C834B830F5F1F4F452B89F742

 :100A50001BBA15BA80916200806180936200C698CB

 :100A600017CE60E070E081E00E94390211CE209143

-:100A70000D01298380910E01422F50E0582B5A839B

-:100A8000498300910F018091100110E0182BC79A43

-:100A90000115110509F4B3C0E1E1AE2EE1E0BE2E6F

-:100AA00029813A81207E4501F501E980FA80312CC7

-:100AB00006C0C701807E2817390709F045C081911B

-:100AC0008F3F09F033948FEFE81AF80A01501109AB

-:100AD0005F0179F7332009F492C060EF80E090E085

+:100A70000D01298380910E01422F50E0582B5C8399

+:100A80004B8300910F018091100110E0182BC79A41

+:100A90000115110509F4B0C061E1862E61E0962EC2

+:100AA0002B813C81207C6401EB80FC80512C06C0B2

+:100AB000C701807C2817390709F04AC0F6018191E7

+:100AC0006F018F3F09F05394FFEFEF1AFF0A0150B7

+:100AD000110971F7552009F48FC060EF80E090E0B4

 :100AE0000E94B0006AEA8AEA9AE00E94B00065E5D6

 :100AF00085E595E00E94B00065E280E090E00E940C

-:100B0000B0003A94632D80E090E00E94B000F401C0

-:100B100061914F016F3F89F089819A810E94B000F5

-:100B200089819A8101963320A1F09A8389833A942E

-:100B3000F40161914F016F3F79F729813A812F5F6D

-:100B40003F4F3A832983E3CF3110C7CFFA82E9823E

-:100B5000A7CF69E280E090E00E94B0001DBC1CBC01

-:100B600029813A8130683C832B83A401415051098B

-:100B70005A8349838CB59DB584389E4108F046C0A0

+:100B0000B0005A94652D80E090E00E94B000F4019E

+:100B100060816F3F99F08B819C810E94B000F4014D

+:100B200041904F018B819C8101965520B9F09C83A7

+:100B30008B835A94F40160816F3F69F72B813C816C

+:100B40002F5F3F4F3C832B833FEF831A930ADFCF06

+:100B50005110C3CF4601FC82EB82A2CF69E280E054

+:100B600090E00E94B0001DBC1CBC2B813C81306811

+:100B70003C832B838CB59DB584389E4108F043C0DF

 :100B80008B819C810E948A00882E8B819C810E948F

-:100B90008A00982E8B819C810E948A00382E882D95

-:100BA000892586FF18C0892D832586FF14C081FC06

-:100BB00078C285FEDFCF63E070E08AE20E943902EE

-:100BC000882D0E946102892D0E946102832D0E945E

+:100B90008A00982E8B819C810E948A00582E882D75

+:100BA000892586FF18C0892D852586FF14C081FC04

+:100BB00074C285FEDFCF63E070E08AE20E943902F2

+:100BC000882D0E946102892D0E946102852D0E945C

 :100BD0006102C7985DCD8B819C810E948A00982E0E

-:100BE0008B819C810E948A009812C4CFE981FA818E

-:100BF00080819812BFCF0115110509F0A7CF60E0E1

-:100C000070E08AE00E943902C79842CD60E070E04F

-:100C10008AE20E943902C7983BCDC79A60EF80E014

-:100C200090E00E94B0006AEA8AEA9AE00E94B0006E

-:100C300065E585E595E00E94B00060E88AEA9AE003

-:100C40000E94B0006AEA8AEA9AE00E94B00065E574

-:100C500085E595E00E94B00060E380E090E00E94AE

-:100C6000B0001DBC1CBC8CB59DB58D389B45D0F427

-:100C700080E090E80E948A0089838CB59DB58D380C

-:100C80009B4580F480E090E80E948A008B83598124

-:100C90005827547409F4F7C189838CB59DB58D38F4

-:100CA0009B4580F360E070E08CE20E943902C798B7

-:100CB000EFCCC79AC69A809162008E7F80936200C3

-:100CC00080916200826080936200FFEF20E732E053

-:100CD000F15020403040E1F700C0000080916200F8

-:100CE000816080936200C798C69860E070E084E1FC

-:100CF0000E943902CDCCC79A60EF80E090E80E9454

-:100D0000E3006AEA8AEA9AE80E94E30065E585E57D

-:100D100095E80E94E30060E88AEA9AE80E94E3000E

-:100D20006AEA8AEA9AE80E94E30065E585E595E8C3

-:100D30000E94E30060E380E090E80E94E3001DBCB5

-:100D40001CBC8CB59DB58D389B4508F0ABCF80E0C1

-:100D500090E80E94380189838CB59DB58D389B45FC

-:100D600008F0A0CF80E090E80E9438012981821726

-:100D700071F089838CB59DB58D389B4508F092CF75

-:100D800080E090E80E94380129818213F2CF4981E6

-:100D90004F3F09F434CF61E070E08BE20E943902EA

-:100DA00089810E946102C79873CC80900D01809167

-:100DB0000E01912C982A50910F01598380911001B6

-:100DC000E52FF0E0F82BFC83EB83C79AEF2B09F4B7

-:100DD0009CC071E1A72E71E0B72E9401207E150111

-:100DE000F5018401F12C06C0C801807E281739075F

-:100DF00009F04AC081918F3F09F0F3940F5F1F4FB4

-:100E00004B815C81415051095C834B835F01452BD1

-:100E100059F7FF2009F479C060EF80E090E80E9464

-:100E2000E3006AEA8AEA9AE80E94E30065E585E55C

-:100E300095E80E94E30065E280E090E80E94E3000C

-:100E4000FA94F9826F2D80E090E80E94E300F101AE

-:100E500061911F016F3FA1F074016894F7F8C70119

-:100E60000E94E300FFEF8F1A9F0A2981222381F05D

-:100E7000598151505983F10161911F016F3F61F711

-:100E80003FEF831A930AE3CFF110C6CF4801A5CFF5

-:100E900069E280E090E80E94E3001DBC1CBCA10157

-:100EA000415051095A8349838CB59DB584389E4180

-:100EB00008F0ACCEC7010E943801882EC7010E94FD

-:100EC0003801982EC7010E943801382E882D8925B7

-:100ED00086FF09C0892D832586FF05C081FCE1C0FE

-:100EE00085FEE2CF68CEC7010E943801982EC70167

-:100EF0000E9438019812D8CFE981FA818081981236

-:100F0000D3CF2B813C81232B09F660E070E08AE08F

-:100F10000E943902C798BCCBE0900D0180910E0170

-:100F2000F12CF82A00910F018091100110E0182B8C

-:100F3000C69A0115110509F4C2C01A821982C701A7

-:100F40000E946A0029813A8128273A83298388E010

-:100F500090E00CC049815A8156954795E1E04E27B3

-:100F6000E0EA5E275A834983019759F0398130FDC1

-:100F7000F1CF29813A81369527953A8329830197C4

-:100F8000A9F7015011093FEFE31AF30A0115110502

-:100F9000B1F619814A8149831BBA15BA8091620062

-:100FA00080618093620062E070E08CE00E94390210

-:100FB000812F0E94610289810E946102C69868CBDC

-:100FC00040910D0180910E0150E0582B60910F016E

-:100FD0008091100170E0782BC69A62BA11BA8091A4

-:100FE00062008068809362008091620081608093DB

-:100FF00062008091620057FD58C082608093620059

-:101000006115710509F458C080E090E04BBB55BBF9

-:10101000E2E0EA95F1F700C020B3822728E030E053

-:1010200009C096958795F1E08F27F0EA9F27215018

-:10103000310939F080FDF5CF96958795215031091A

-:10104000C9F7615071094F5F5F4F61157105F1F686

-:101050008B839983809162008260809362001BBAC7

-:1010600015BA8091620080618093620062E070E056

-:1010700088E00E9439028B810E94610289810E946E

-:101080006102C69805CBFB81FF3F09F4B8CD61E052

-:1010900070E08BE20E9439028B810E946102C79846

-:1010A000F7CA63E070E089E289CD8D7F80936200AA

-:1010B0006115710509F0A8CF19821B82CBCF198267

-:0810C00010E06ACFF894FFCFA5

+:100BE0008B819C810E948A009812C4CF4910C2CF89

+:100BF0000115110509F0AECF60E070E08AE00E94B7

+:100C00003902C79845CD60E070E08AE20E9439025F

+:100C1000C7983ECDC79A60EF80E090E00E94B00098

+:100C20006AEA8AEA9AE00E94B00065E585E595E007

+:100C30000E94B00060E88AEA9AE00E94B0006AEA86

+:100C40008AEA9AE00E94B00065E585E595E00E9499

+:100C5000B00060E380E090E00E94B0001DBC1CBCCE

+:100C60008CB59DB58D389B45D0F480E090E80E940E

+:100C70008A0089838CB59DB58D389B4580F480E0D2

+:100C800090E80E948A008A8359815827547409F495

+:100C9000F6C189838CB59DB58D389B4580F360E0A6

+:100CA00070E08CE20E943902C798F2CCC79AC69ACB

+:100CB000809162008E7F80936200809162008260EA

+:100CC00080936200FFEF20E732E0F1502040304097

+:100CD000E1F700C0000080916200816080936200B3

+:100CE000C798C69860E070E084E10E943902D0CCD9

+:100CF000C79A60EF80E090E80E94E3006AEA8AEA1F

+:100D00009AE80E94E30065E585E595E80E94E30026

+:100D100060E88AEA9AE80E94E3006AEA8AEA9AE8C6

+:100D20000E94E30065E585E595E80E94E30060E345

+:100D300080E090E80E94E3001DBC1CBC8CB59DB512

+:100D40008D389B4508F0ABCF80E090E80E943801D9

+:100D500089838CB59DB58D389B4508F0A0CF80E088

+:100D600090E80E9438015981851771F089838CB50C

+:100D70009DB58D389B4508F092CF80E090E80E94A9

+:100D8000380159818513F2CFF981FF3F09F434CF3F

+:100D900061E070E08BE20E94390289810E94610269

+:100DA000C79876CC40900D0180910E01512C582AA5

+:100DB00020910F01298380911001422F50E0582B80

+:100DC0005C834B83C79A452B09F49BC051E1852E68

+:100DD00051E0952E9201207C64018201F12C06C025

+:100DE000C801807C2817390709F050C0F6018191AD

+:100DF0006F018F3F09F0F3940F5F1F4F4B815C81B0

+:100E0000415051095C834B83452B51F7FF2009F476

+:100E100078C060EF80E090E80E94E3006AEA8AEA26

+:100E20009AE80E94E30065E585E595E80E94E30005

+:100E300065E280E090E80E94E300FA94F9826F2D69

+:100E400080E090E80E94E300F40160816F3FB9F018

+:100E500072016894F7F8C7010E94E300F401219140

+:100E60004F012A833FEF431A530A4981442399F0E3

+:100E7000598151505983F40160816F3F49F74FEF19

+:100E8000441A540A5FEF851A950ADECFF110C1CFDC

+:100E9000460128019FCF69E280E090E80E94E300CC

+:100EA0001DBC1CBC8CB59DB584389E4108F0ABCEF2

+:100EB000C7010E943801882EC7010E943801982E70

+:100EC000C7010E943801582E882D892586FF09C048

+:100ED000892D852586FF05C081FCDFC085FEE2CF18

+:100EE0006ACEC7010E943801982EC7010E943801BE

+:100EF0009812D8CF8A818911D5CFEB81FC81EF2B55

+:100F000039F660E070E08AE00E943902C798C0CBF1

+:100F1000E0900D0180910E01F12CF82A00910F0153

+:100F20008091100110E0182BC69A0115110509F4E3

+:100F3000C2C01C821B82C7010E946A00EB81FC8137

+:100F4000E827FC83EB8388E090E00CC02B813C8198

+:100F50003695279541E0242740EA34273C832B83AC

+:100F6000019759F0FB81F0FDF1CFEB81FC81F69503

+:100F7000E795FC83EB830197A9F701501109FFEF77

+:100F8000EF1AFF0A01151105B1F61B812C81298387

+:100F90001BBA15BA8091620080618093620062E0A2

+:100FA00070E08CE00E943902812F0E9461028981E9

+:100FB0000E946102C6986CCB40910D0180910E0198

+:100FC00050E0582B60910F018091100170E0782B58

+:100FD000C69A62BA11BA80916200806880936200FA

+:100FE000809162008160809362008091620057FD71

+:100FF00058C08260809362006115710509F458C081

+:1010000080E090E04BBB55BBE2E0EA95F1F700C011

+:1010100020B3822728E030E009C096958795F1E05B

+:101020008F27F0EA9F272150310939F080FDF5CF55

+:101030009695879521503109C9F7615071094F5F25

+:101040005F4F61157105F1F68A8399838091620083

+:101050008260809362001BBA15BA80916200806141

+:101060008093620062E070E088E00E9439028A8129

+:101070000E94610289810E946102C69809CBFA81AF

+:10108000FF3F09F4B9CD61E070E08BE20E943902C4

+:101090008A810E946102C798FBCA63E070E089E21E

+:1010A0008DCD8D7F809362006115710509F0A8CF09

+:1010B00019821A82CBCF198210E06ACFF894FFCF41

 :00000001FF