From aaa68d2ebcb732d7d18af1a41a292c50182e7fd5 Mon Sep 17 00:00:00 2001 From: Lywx Date: Fri, 22 Mar 2024 09:59:49 -0600 Subject: Cleanup (#49) * Auto debug info generation and some cleanup * Cleaned dry code from segments * Fixed gCurrentCompressionType bss bs --- src/factories/sf64/ScriptFactory.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/factories/sf64/ScriptFactory.cpp') diff --git a/src/factories/sf64/ScriptFactory.cpp b/src/factories/sf64/ScriptFactory.cpp index 03c1c6d..75f05f8 100644 --- a/src/factories/sf64/ScriptFactory.cpp +++ b/src/factories/sf64/ScriptFactory.cpp @@ -40,13 +40,9 @@ ExportResult SF64::ScriptCodeExporter::Export(std::ostream &write, std::shared_p auto sortedPtrs = script->mPtrs; std::sort(sortedPtrs.begin(), sortedPtrs.end()); std::vector scriptNames; - auto cmdOff = script->mCmdsStart; + auto cmdOff = ASSET_PTR(script->mCmdsStart); auto cmdIndex = 0; - if(IS_SEGMENTED(cmdOff)) { - cmdOff = SEGMENT_OFFSET(cmdOff); - } - for(int i = 0; i < sortedPtrs.size(); i++) { std::ostringstream scriptDefaultName; scriptDefaultName << symbol << "_cmds_" << std::uppercase << std::hex << cmdOff; @@ -75,13 +71,7 @@ ExportResult SF64::ScriptCodeExporter::Export(std::ostream &write, std::shared_p write << "\n"; } - if (Companion::Instance->IsDebug()) { - if (IS_SEGMENTED(offset)) { - offset = SEGMENT_OFFSET(offset); - } - write << "// 0x" << std::hex << std::uppercase << offset << "\n"; - } - + write << "// 0x" << std::hex << std::uppercase << ASSET_PTR(offset) << "\n"; write << "u16* " << symbol << "[] = {"; for(int i = 0; i < script->mPtrs.size(); i++) { if((i % 5) == 0) { @@ -97,7 +87,7 @@ ExportResult SF64::ScriptCodeExporter::Export(std::ostream &write, std::shared_p return OffsetEntry { script->mCmdsStart, - static_cast((IS_SEGMENTED(offset) ? SEGMENT_OFFSET(offset) : offset) + script->mPtrs.size() * sizeof(uint32_t)) + static_cast(offset + script->mPtrs.size() * sizeof(uint32_t)) }; } -- cgit v1.2.3