mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-01 13:52:19 -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>
84 lines
2.2 KiB
C++
84 lines
2.2 KiB
C++
#include "SetMinimapChests.h"
|
|
|
|
#include "Globals.h"
|
|
#include "Utils/BitConverter.h"
|
|
#include "Utils/StringHelper.h"
|
|
#include "ZFile.h"
|
|
#include "ZRoom/ZRoom.h"
|
|
|
|
SetMinimapChests::SetMinimapChests(ZFile* nParent) : ZRoomCommand(nParent)
|
|
{
|
|
}
|
|
|
|
void SetMinimapChests::ParseRawData()
|
|
{
|
|
ZRoomCommand::ParseRawData();
|
|
int numChests = cmdArg1;
|
|
|
|
offset_t currentPtr = segmentOffset;
|
|
|
|
chests.reserve(numChests);
|
|
for (int32_t i = 0; i < numChests; i++)
|
|
{
|
|
MinimapChest chest(parent->GetRawData(), currentPtr);
|
|
chests.push_back(chest);
|
|
|
|
currentPtr += 10;
|
|
}
|
|
}
|
|
|
|
void SetMinimapChests::DeclareReferences(const std::string& prefix)
|
|
{
|
|
std::string declaration;
|
|
|
|
size_t index = 0;
|
|
for (const auto& chest : chests)
|
|
{
|
|
declaration += StringHelper::Sprintf(" { %s },", chest.GetBodySourceCode().c_str());
|
|
|
|
if (index < chests.size() - 1)
|
|
declaration += "\n";
|
|
|
|
index++;
|
|
}
|
|
|
|
parent->AddDeclarationArray(
|
|
segmentOffset, DeclarationAlignment::Align4, chests.size() * 10, "MinimapChest",
|
|
StringHelper::Sprintf("%sMinimapChests0x%06X", prefix.c_str(), segmentOffset),
|
|
chests.size(), declaration);
|
|
}
|
|
|
|
std::string SetMinimapChests::GetBodySourceCode() const
|
|
{
|
|
std::string listName;
|
|
Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapChest", listName,
|
|
parent->workerID);
|
|
return StringHelper::Sprintf("SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(0x%02X, %s)", chests.size(),
|
|
listName.c_str());
|
|
}
|
|
|
|
std::string SetMinimapChests::GetCommandCName() const
|
|
{
|
|
return "SCmdMinimapChests";
|
|
}
|
|
|
|
RoomCommand SetMinimapChests::GetRoomCommand() const
|
|
{
|
|
return RoomCommand::SetMinimapChests;
|
|
}
|
|
|
|
MinimapChest::MinimapChest(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 MinimapChest::GetBodySourceCode() const
|
|
{
|
|
return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6,
|
|
unk8);
|
|
}
|