diff --git a/codegen/src/AddressGen.cpp b/codegen/src/AddressGen.cpp index 0db80e7c..aa7b3a33 100644 --- a/codegen/src/AddressGen.cpp +++ b/codegen/src/AddressGen.cpp @@ -122,8 +122,8 @@ std::string generateAddressHeader(Root const& root) { } else if (codegen::shouldAndroidBind(fn)) { auto const mangled = generateAndroidSymbol(c, fn); - address_str = fmt::format( - "reinterpret_cast(dlsym(reinterpret_cast(geode::base::get()), \"{}\"))", + address_str = fmt::format( // thumb + "reinterpret_cast(dlsym(reinterpret_cast(geode::base::get()), \"{}\")) + 1", mangled ); } diff --git a/loader/src/platform/android/gdstdlib.cpp b/loader/src/platform/android/gdstdlib.cpp index b37ae929..da52cff9 100644 --- a/loader/src/platform/android/gdstdlib.cpp +++ b/loader/src/platform/android/gdstdlib.cpp @@ -38,9 +38,7 @@ namespace gd { string::~string() { if (m_data == nullptr) return; - reinterpret_cast(geode::base::get() + 0x5054bc)( - &m_data[-1] - ); + // reinterpret_cast(geode::base::get() + 0x5054bc)(this); } bool string::operator<(string const& other) const {