summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshDuMan <40190173+JoshDuMan@users.noreply.github.com>2022-03-03 19:21:05 -0500
committerM4xw <m4x@m4xw.net>2022-03-22 02:37:51 +0100
commit93460fd3988014bef7733e96bb4124e614637b82 (patch)
treee5be2125ff4a69ef3aac47f2c7f19ce49e06cb45
parent07e5b8917f959a6ed341d6064adf8883186901d5 (diff)
Revert "Remove break points. (#39)"
This reverts commit cda126e40c426827dbce5e7fa6e19e4944d4d658.
-rw-r--r--OTRExporter/DisplayListExporter.cpp10
-rw-r--r--OTRExporter/RoomExporter.cpp2
2 files changed, 12 insertions, 0 deletions
diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp
index ae7cf09..11769c4 100644
--- a/OTRExporter/DisplayListExporter.cpp
+++ b/OTRExporter/DisplayListExporter.cpp
@@ -238,6 +238,8 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
Declaration* mtxDecl = dList->parent->GetDeclaration(GETSEGOFFSET(mm));
+ int bp = 0;
+
writer->Write(word0);
writer->Write(word1);
@@ -337,6 +339,8 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr);
+ int bp = 0;
+
Gfx value = gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z);
word0 = (value.words.w0 & 0x00FFFFFF) + (G_BRANCH_Z_OTR << 24);
word1 = value.words.w1;
@@ -426,9 +430,15 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
auto data2 = dList->instructions[dataIdx - 1];
dListPtr = GETSEGOFFSET(data2);
}
+ else
+ {
+ int bp = 0;
+ }
Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr);
+ int bp = 0;
+
writer->Write(word0);
writer->Write(word1);
diff --git a/OTRExporter/RoomExporter.cpp b/OTRExporter/RoomExporter.cpp
index ad547f4..fa5987e 100644
--- a/OTRExporter/RoomExporter.cpp
+++ b/OTRExporter/RoomExporter.cpp
@@ -483,6 +483,8 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
File::WriteAllBytes("Extract\\" + path, pathStream->ToVector());
//otrArchive->AddFile(path, (uintptr_t)pathStream->ToVector().data(), pathWriter.GetBaseAddress());
+
+ int bp = 0;
}
}
break;