3 files changed, 10 insertions, 5 deletions
diff --git a/src/factories/BaseFactory.h b/src/factories/BaseFactory.h
index 23293cf..3cbb0d9 100644
--- a/src/factories/BaseFactory.h
+++ b/src/factories/BaseFactory.h
@@ -17,7 +17,7 @@
 
 #define SEGMENT_OFFSET(a) ((uint32_t)(a) & 0x00FFFFFF)
 #define SEGMENT_NUMBER(x) (((uint32_t)(x) >> 24) & 0xFF)
-#define IS_SEGMENTED(x) (((x) > 0x01000000) && (SEGMENT_NUMBER(x) < 0x20))
+#define IS_SEGMENTED(x) (((uint32_t)(x) > 0x01000000) && (SEGMENT_NUMBER(x) < 0x20))
 
 #define tab "\t"
 #define fourSpaceTab "    "
diff --git a/src/utils/Decompressor.cpp b/src/utils/Decompressor.cpp
index a53177b..b4ca7a4 100644
--- a/src/utils/Decompressor.cpp
+++ b/src/utils/Decompressor.cpp
@@ -40,10 +40,13 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector<uint8_t>
         throw std::runtime_error("Failed to find offset");
     }
 
-    const auto offset = TranslateAddr(node["offset"].as<uint32_t>());
+    auto offset = node["offset"].as<uint32_t>();    
 
     if(node["mio0"]){
         const auto mio0 = node["mio0"].as<uint32_t>();
+
+        offset = TranslateAddr(offset, IS_SEGMENTED(offset));        
+
         auto decoded = Decode(buffer, offset, CompressionType::MIO0);
         auto size = node["size"] ? node["size"].as<size_t>() : manualSize.value_or(decoded->size - mio0);
 
@@ -61,13 +64,15 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector<uint8_t>
         throw std::runtime_error("Yaz0 not implemented");
     }
 
+    offset = TranslateAddr(offset);
+
     return {
         .root = nullptr,
         .segment = { buffer.data() + offset, node["size"] ? node["size"].as<size_t>() : manualSize.value_or(buffer.size() - offset) }
     };
 }
 
-uint32_t Decompressor::TranslateAddr(uint32_t addr){
+uint32_t Decompressor::TranslateAddr(uint32_t addr, bool baseAddress){
     if(IS_SEGMENTED(addr)){
         const auto segment = Companion::Instance->GetSegmentedAddr(SEGMENT_NUMBER(addr));
 
@@ -76,7 +81,7 @@ uint32_t Decompressor::TranslateAddr(uint32_t addr){
             return 0;
         }
 
-        return segment.value() + SEGMENT_OFFSET(addr);
+        return segment.value() + (!baseAddress ? SEGMENT_OFFSET(addr) : 0);
     }
 
     return addr;
diff --git a/src/utils/Decompressor.h b/src/utils/Decompressor.h
index 5d321e5..718b726 100644
--- a/src/utils/Decompressor.h
+++ b/src/utils/Decompressor.h
@@ -29,7 +29,7 @@ class Decompressor {
 public:
     static DataChunk* Decode(const std::vector<uint8_t>& buffer, uint32_t offset, CompressionType type);
     static DecompressedData AutoDecode(YAML::Node& node, std::vector<uint8_t>& buffer, std::optional<size_t> size = std::nullopt);
-    static uint32_t TranslateAddr(uint32_t addr);
+    static uint32_t TranslateAddr(uint32_t addr, bool baseAddress = false);
     static bool IsSegmented(uint32_t addr);
     static bool IsCompressed(YAML::Node& node);
     static void CopyCompression(YAML::Node& from, YAML::Node& to);