diff options
| author | Kenix3 <kenixwhisperwind@gmail.com> | 2021-01-01 18:31:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 18:31:05 -0500 |
| commit | 1a71d7020ee7a601232cc4a422101061703bf3c6 (patch) | |
| tree | 584549dcaa01578e9240c89334e8c77ee7886443 /ZAPD/ZRoom/Commands/SetCutscenes.cpp | |
| parent | a8430341a143a40d31874b6659dff89aa58959da (diff) | |
No longer using snake case name variables and segment offsets now print to 6 characters (#39)
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetCutscenes.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetCutscenes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPD/ZRoom/Commands/SetCutscenes.cpp index dd3d4d0..c6320ff 100644 --- a/ZAPD/ZRoom/Commands/SetCutscenes.cpp +++ b/ZAPD/ZRoom/Commands/SetCutscenes.cpp @@ -19,12 +19,12 @@ SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawD if (segmentOffset != 0) zRoom->parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::None, DeclarationPadding::Pad16, cutscene->GetRawDataSize(), "s32", - StringHelper::Sprintf("_%s_cutsceneData_%08X", zRoom->GetName().c_str(), segmentOffset), 0, output); + StringHelper::Sprintf("%sCutsceneData0x%06X", zRoom->GetName().c_str(), segmentOffset), 0, output); } string SetCutscenes::GenerateSourceCodePass1(string roomName, int baseAddress) { - return StringHelper::Sprintf("%s 0, (u32)&_%s_cutsceneData_%08X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), zRoom->GetName().c_str(), segmentOffset); + return StringHelper::Sprintf("%s 0, (u32)%sCutsceneData0x%06X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), zRoom->GetName().c_str(), segmentOffset); } int32_t SetCutscenes::GetRawDataSize() @@ -34,7 +34,7 @@ int32_t SetCutscenes::GetRawDataSize() string SetCutscenes::GenerateExterns() { - return StringHelper::Sprintf("extern s32 _%s_cutsceneData_%08X[];\n", zRoom->GetName().c_str(), segmentOffset); + return StringHelper::Sprintf("extern s32 %sCutsceneData0x%06X[];\n", zRoom->GetName().c_str(), segmentOffset); } string SetCutscenes::GetCommandCName() |