commit - 2dc7cc54f72e53f42c087edac8010a2c7b707132
commit + 1f373332ee43b7a9c5af2a4a97a736ab63073c96
blob - 39d426c2ffa46120a2543ff12e82eb9ae0a80f21
blob + 553f50f8707eccbfe3c691978635429358441118
--- tools/img_eGON.BT0/img_eGON.BT0.cc
+++ tools/img_eGON.BT0/img_eGON.BT0.cc
@@ -128,65 +128,71 @@ bool run(int argc, char *argv[])
         return false;
     }
 
-    std::cout << "+00 Jump instruction : 0x"
+    std::cout << "+0x00 Jump instruction : 0x"
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_jump_instruction << std::endl;
 
-    std::cout << "+04 Magic            :";
+    std::cout << "+0x04 Magic            :";
     for (const auto ch : header.m_magic)
         std::cout << " 0x" << std::hex << std::setw(2) << std::setfill('0')
                   << uint32_t(ch);
     std::cout << std::endl;
-    std::cout << "                       ";
+    std::cout << "                         ";
     for (const auto ch : header.m_magic)
         std::cout << printable(ch);
     std::cout << std::endl;
 
-    std::cout << "+0C Checksum         : 0x" 
+    std::cout << "+0x0C Checksum         : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_checksum << std::endl;
 
-    std::cout << "+10 Length           : 0x" 
+    std::cout << "+0x10 Length           : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') << header.m_length
               << ", " << std::dec << header.m_length << std::endl;
 
-    std::cout << "+14 SPL signature    :";
+    std::cout << "+0x14 SPL signature    :";
     for (const auto ch : header.m_spl_signature)
         std::cout << " 0x" << std::hex << std::setw(2) << std::setfill('0')
                   << uint32_t(ch);
     std::cout << std::endl;
-    std::cout << "                       ";
+    std::cout << "                         ";
     for (const auto ch : header.m_spl_signature)
         std::cout << printable(ch);
     std::cout << std::endl;
 
-    std::cout << "+18                  : 0x" 
+    std::cout << "+0x18                  : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_zero18 << std::endl;
 
-    std::cout << "+1C                  : 0x" 
+    std::cout << "+0x1C                  : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_zero1C << std::endl;
 
-    std::cout << "+20 Name offset      : 0x" 
+    std::cout << "+0x20 Name offset      : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') << header.m_name_offset
               << ", " << std::dec << header.m_name_offset;
     std::cout << std::endl;
 
-    std::cout << "+24                  : 0x" 
+    std::cout << "+0x24                  : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_zero24 << std::endl;
 
-    std::cout << "+28                  : 0x" 
+    std::cout << "+0x28                  : 0x" 
               << std::hex << std::setw(8) << std::setfill('0') 
               << header.m_zero28 << std::endl;
 
-    std::cout << "+2C Strings          :";
+    std::cout << "+0x2C Strings          :";
+    auto printed = 0;
     for (const auto ch : header.m_strings)
+    {
+        if (printed && (printed % 8) == 0)
+            std::cout << std::endl << "                        ";
         std::cout << " 0x" << std::hex << std::setw(2) << std::setfill('0')
                   << uint32_t(ch);
+        printed += 1;
+    }
     std::cout << std::endl;
-    std::cout << "                       ";
+    std::cout << "                         ";
     for (const auto ch : header.m_strings)
         std::cout << printable(ch);
     std::cout << std::endl;