Fixed geo layout factory bugs and some sm64 related stuff

1 files changed, 27 insertions, 2 deletions

diff --git a/src/factories/DisplayListOverrides.cpp b/src/factories/DisplayListOverrides.cpp
index 32c9b5c..4e7d1a7 100644
--- a/src/factories/DisplayListOverrides.cpp
+++ b/src/factories/DisplayListOverrides.cpp
@@ -112,17 +112,42 @@ int Palette(uint32_t ptr, int32_t idx, int32_t count) {
     return 0;
 }
 
-int Light(uint32_t ptr, int32_t count) {
+int Lights(uint32_t ptr, int32_t count) {
     auto dec = Companion::Instance->GetNodeByAddr(ptr);
 
     if(dec.has_value()){
         auto node = std::get<1>(dec.value());
         auto symbol = GetSafeNode<std::string>(node, "symbol");
-        SPDLOG_INFO("Found Light: 0x{:X} Symbol: {}", ptr, symbol);
+        SPDLOG_INFO("Found Lightsn: 0x{:X} Symbol: {}", ptr, symbol);
         gfxd_puts(symbol.c_str());
         return 1;
     }
 
+    SPDLOG_WARN("Could not find lights at 0x{:X}", ptr);
+    return 0;
+}
+
+int Light(uint32_t ptr) {
+    auto res = Companion::Instance->GetNodeByAddr(ptr);
+
+    if(res.has_value()){
+        auto node = std::get<1>(res.value());
+        auto symbol = GetSafeNode<std::string>(node, "symbol");
+        SPDLOG_INFO("Found Light A Ptr: 0x{:X} Symbol: {}", ptr, symbol);
+        gfxd_puts(("&" + symbol + ".a").c_str());
+        return 1;
+    }
+
+    res = Companion::Instance->GetNodeByAddr(ptr - 0x8);
+
+    if(res.has_value()){
+        auto node = std::get<1>(res.value());
+        auto symbol = GetSafeNode<std::string>(node, "symbol");
+        SPDLOG_INFO("Found Light L Ptr: 0x{:X} Symbol: {}", ptr, symbol);
+        gfxd_puts(("&" + symbol + ".l").c_str());
+        return 1;
+    }
+
     SPDLOG_WARN("Could not find light at 0x{:X}", ptr);
     return 0;
 }