mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-23 18:02:18 -05:00
f31a841789
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "6aa54a551" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "6aa54a551" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "88b012240" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "88b012240" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update (its broken) * fix the enum * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "b7b6e1c82" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "b7b6e1c82" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * New names for LUS actions * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "c5cfebeee" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "c5cfebeee" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "d5f4769b8" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "d5f4769b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Fix missing commands in the exporter. * Cleanups. * git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR subrepo: subdir: "ZAPDTR" merged: "d4c35b90a" upstream: origin: "https://github.com/harbourmasters/ZAPDTR" branch: "master" commit: "d4c35b90a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add unordered_map include to fix MacOS * fix string_view * Update Main.cpp * fix string view * So close I can almost taste it * So close * Fix missed git marker. * Fix surface types and * Update ZFile.cpp * Delete Jenkinsfile --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
99 lines
2.8 KiB
C++
99 lines
2.8 KiB
C++
#include "SetMinimapList.h"
|
|
|
|
#include "Globals.h"
|
|
#include "Utils/BitConverter.h"
|
|
#include "Utils/StringHelper.h"
|
|
#include "ZFile.h"
|
|
#include "ZRoom/ZRoom.h"
|
|
|
|
SetMinimapList::SetMinimapList(ZFile* nParent) : ZRoomCommand(nParent)
|
|
{
|
|
}
|
|
|
|
void SetMinimapList::ParseRawData()
|
|
{
|
|
ZRoomCommand::ParseRawData();
|
|
listSegmentAddr = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset);
|
|
listSegmentOffset = GETSEGOFFSET(listSegmentAddr);
|
|
unk4 = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + 4);
|
|
|
|
uint32_t currentPtr = listSegmentOffset;
|
|
|
|
minimaps.reserve(zRoom->roomCount);
|
|
for (int32_t i = 0; i < zRoom->roomCount; i++)
|
|
{
|
|
MinimapEntry entry(parent->GetRawData(), currentPtr);
|
|
minimaps.push_back(entry);
|
|
|
|
currentPtr += 10;
|
|
}
|
|
}
|
|
|
|
void SetMinimapList::DeclareReferences(const std::string& prefix)
|
|
{
|
|
{
|
|
std::string declaration;
|
|
|
|
size_t index = 0;
|
|
for (const auto& entry : minimaps)
|
|
{
|
|
declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str());
|
|
|
|
if (index < minimaps.size() - 1)
|
|
declaration += "\n";
|
|
|
|
index++;
|
|
}
|
|
|
|
parent->AddDeclarationArray(
|
|
listSegmentOffset, DeclarationAlignment::Align4, minimaps.size() * 10, "MinimapEntry",
|
|
StringHelper::Sprintf("%sMinimapEntryList0x%06X", prefix.c_str(), listSegmentOffset),
|
|
minimaps.size(), declaration);
|
|
}
|
|
|
|
{
|
|
std::string listName;
|
|
Globals::Instance->GetSegmentedPtrName(listSegmentAddr, parent, "MinimapEntry", listName,
|
|
parent->workerID);
|
|
std::string declaration = StringHelper::Sprintf("\n\t%s, 0x%08X\n", listName.c_str(), unk4);
|
|
|
|
parent->AddDeclaration(
|
|
segmentOffset, DeclarationAlignment::Align4, 8, "MinimapList",
|
|
StringHelper::Sprintf("%sMinimapList0x%06X", prefix.c_str(), segmentOffset),
|
|
declaration);
|
|
}
|
|
}
|
|
|
|
std::string SetMinimapList::GetBodySourceCode() const
|
|
{
|
|
std::string listName;
|
|
Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapList", listName,
|
|
parent->workerID);
|
|
return StringHelper::Sprintf("SCENE_CMD_MINIMAP_INFO(%s)", listName.c_str());
|
|
}
|
|
|
|
std::string SetMinimapList::GetCommandCName() const
|
|
{
|
|
return "SCmdMinimapSettings";
|
|
}
|
|
|
|
RoomCommand SetMinimapList::GetRoomCommand() const
|
|
{
|
|
return RoomCommand::SetMinimapList;
|
|
}
|
|
|
|
MinimapEntry::MinimapEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex)
|
|
: unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)),
|
|
unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)),
|
|
unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)),
|
|
unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)),
|
|
unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8))
|
|
{
|
|
}
|
|
|
|
std::string MinimapEntry::GetBodySourceCode() const
|
|
{
|
|
return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6,
|
|
unk8);
|
|
}
|