Commit ID in build info screen

2 files changed, 28 insertions, 11 deletions

diff --git a/buildinfo.asm b/buildinfo.asm
index a77d09c..435c31f 100644
--- a/buildinfo.asm
+++ b/buildinfo.asm
@@ -12,10 +12,25 @@ show_build_info:
   ; clear screen
   jsr clear_screen
 
+  .ifdef string_commit
+print_commit:
+  lda #$21
+  sta PPUADDR
+  lda #$04
+  sta PPUADDR
+  ; filename
+  lda #LOW(string_commit)
+  sta <COPY_SOURCE_ADDR
+  lda #HIGH(string_commit)
+  sta <COPY_SOURCE_ADDR+1
+  jsr print_text
+  .endif
+
+print_filename:
   bit PPUSTATUS
   lda #$21
   sta PPUADDR
-  lda #$24
+  lda #$44
   sta PPUADDR
   ; filename
   lda #LOW(string_file)
@@ -24,9 +39,10 @@ show_build_info:
   sta <COPY_SOURCE_ADDR+1
   jsr print_text
 
+print_build_date:
   lda #$21
   sta PPUADDR
-  lda #$64
+  lda #$84
   sta PPUADDR
   ; build date
   lda #LOW(string_build_date)
@@ -35,9 +51,10 @@ show_build_info:
   sta <COPY_SOURCE_ADDR+1
   jsr print_text
 
+print_build_time:
   lda #$21
   sta PPUADDR
-  lda #$A4
+  lda #$C4
   sta PPUADDR
   ; build time
   lda #LOW(string_build_time)
@@ -46,9 +63,9 @@ show_build_info:
   sta <COPY_SOURCE_ADDR+1
   jsr print_text
 
-  lda #$21
+  lda #$22
   sta PPUADDR
-  lda #$E4
+  lda #$04
   sta PPUADDR
   ; console region/type
   lda #LOW(string_console_type)
@@ -98,7 +115,7 @@ show_build_info:
 print_flash_type:
   lda #$22
   sta PPUADDR
-  lda #$24
+  lda #$44
   sta PPUADDR
   lda #LOW(string_flash)
   sta <COPY_SOURCE_ADDR
@@ -115,7 +132,6 @@ print_flash_type:
   sta <COPY_SOURCE_ADDR+1
   jsr print_text
   jmp print_chr_size
-
   ; yes, it's writable
 .writable:
   lda #LOW(string_writable)
@@ -123,7 +139,6 @@ print_flash_type:
   lda #HIGH(string_writable)
   sta <COPY_SOURCE_ADDR+1
   jsr print_text
-
   ; how many memory?
   lda <FLASH_TYPE
   sec
@@ -139,7 +154,7 @@ print_flash_type:
 print_chr_size:
   lda #$22
   sta PPUADDR
-  lda #$64
+  lda #$84
   sta PPUADDR
   lda #LOW(string_chr_ram)
   sta <COPY_SOURCE_ADDR
@@ -158,7 +173,7 @@ print_chr_size:
 print_prg_ram:
   lda #$22
   sta PPUADDR
-  lda #$A4
+  lda #$C4
   sta PPUADDR
   lda #LOW(string_prg_ram)
   sta <COPY_SOURCE_ADDR
diff --git a/tools_sources/CoolgirlCombiner/Program.cs b/tools_sources/CoolgirlCombiner/Program.cs
index 079437a..c4225d8 100644
--- a/tools_sources/CoolgirlCombiner/Program.cs
+++ b/tools_sources/CoolgirlCombiner/Program.cs
@@ -389,7 +389,7 @@ namespace com.clusterrr.Famicom.CoolGirl
                                 }

                                 usedSpace = Math.Max(usedSpace, (uint)(pos + prg.Length));

                                 fitted = true;

-                                Console.WriteLine($"offset: {pos:X8}");

+                                Console.WriteLine($"offset: 0x{pos:X8}");

                                 break;

                             }

                         }

@@ -747,6 +747,8 @@ namespace com.clusterrr.Famicom.CoolGirl
                     asmResult.Append(BytesToAsm(StringToTiles("PRESENT", symbols)));

                     asmResult.AppendLine("string_not_available:");

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

+                    asmResult.AppendLine("string_commit:");

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

                     asmResult.AppendLine("string_saving:");

                     if (optionLanguage == "rus")

                         asmResult.Append(BytesToAsm(StringToTiles("  СОХРАНЯЕМСЯ... НЕ ВЫКЛЮЧАЙ!   ", symbols)));