Fixed broken saves

3 files changed, 13 insertions, 9 deletions

diff --git a/flash.asm b/flash.asm
index f5cde83..14e0f74 100644
--- a/flash.asm
+++ b/flash.asm
@@ -50,9 +50,11 @@ sector_erase:
   lda #$30
   sta $8000 ; $30 -> $0000
   jsr disable_flash_write
+  lda #$FF
 .wait:
-  lda $8000
-  cmp #$FF
+  cmp $8000
+  bne .wait
+  cmp $8000
   bne .wait
   jsr banking_init
   rts
@@ -74,9 +76,9 @@ write_flash:
   lda [COPY_SOURCE_ADDR], y
   sta [COPY_DEST_ADDR], y
 .wait:
-  cmp [COPY_SOURCE_ADDR], y
+  cmp [COPY_DEST_ADDR], y
   bne .wait
-  cmp [COPY_SOURCE_ADDR], y
+  cmp [COPY_DEST_ADDR], y
   bne .wait
   iny
   bne .loop
diff --git a/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj b/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj
index b88e8f2..80185a4 100644
--- a/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj
+++ b/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj
@@ -10,9 +10,9 @@
     <Nullable>enable</Nullable>

     <RepositoryUrl>https://github.com/ClusterM/coolgirl-multirom-builder</RepositoryUrl>

     <RepositoryType>git</RepositoryType>

-    <AssemblyVersion>2.0.0</AssemblyVersion>

-    <FileVersion>2.0.0</FileVersion>

-    <Version>2.0.0</Version>

+    <AssemblyVersion>2.0.1</AssemblyVersion>

+    <FileVersion>2.0.1</FileVersion>

+    <Version>2.0.1</Version>

     <NeutralLanguage>en</NeutralLanguage>

     <Authors>Alexey 'Cluster' Avdyukhin</Authors>

   </PropertyGroup>

diff --git a/tools_sources/CoolgirlCombiner/Program.cs b/tools_sources/CoolgirlCombiner/Program.cs
index f668c3e..7bb7614 100644
--- a/tools_sources/CoolgirlCombiner/Program.cs
+++ b/tools_sources/CoolgirlCombiner/Program.cs
@@ -28,7 +28,8 @@ namespace com.clusterrr.Famicom.CoolGirl
         {

             try

             {

-                Console.WriteLine($"COOLGIRL Combiner v{Assembly.GetExecutingAssembly()?.GetName()?.Version?.Major}.{Assembly.GetExecutingAssembly()?.GetName()?.Version?.Minor}");

+                var version = Assembly.GetExecutingAssembly()?.GetName()?.Version;                

+                Console.WriteLine($"COOLGIRL Combiner v{version?.Major}.{version?.Minor}{((version?.Build ?? 0) > 0 ? $"{(char)((byte)'a' + version!.Build)}" : "")}");

                 Console.WriteLine($"  Commit {Properties.Resources.gitCommit} @ {REPO_PATH}");

 #if DEBUG

                 Console.WriteLine($"  Debug version, build time: {BUILD_TIME.ToLocalTime()}");

@@ -564,7 +565,8 @@ namespace com.clusterrr.Famicom.CoolGirl
                     asmResult.AppendLine("string_not_available:");

                     asmResult.Append(BytesToAsm(StringToTiles("NOT AVAILABLE", symbols)));

                     asmResult.AppendLine("string_version:");

-                    asmResult.Append(BytesToAsm(StringToTiles($"VERSION: {Assembly.GetExecutingAssembly()?.GetName()?.Version?.Major}.{Assembly.GetExecutingAssembly()?.GetName()?.Version?.Minor}", symbols)));

+                    var v = Assembly.GetExecutingAssembly()?.GetName()?.Version;

+                    asmResult.Append(BytesToAsm(StringToTiles($"VERSION: {v?.Major}.{v?.Minor}{((v?.Build ?? 0) > 0 ? $"{(char)((byte)'a' + v!.Build)}" : "")}", symbols)));

                     asmResult.AppendLine("string_commit:");

                     asmResult.Append(BytesToAsm(StringToTiles($"COMMIT: {Properties.Resources.gitCommit}", symbols)));