Fix most -Wall warnings (#115)

* started on basic type errors

* Done. For now

* remove libgfxd binary

* Most warnings fixed

* Fix conflicts and new warnings

* Makefile

* Sig

* Clang format

* destructor

* Add a bunch of destructors

* clear the scalars vector after freeing the elements

* PR fixes (Anghelo Alf)

* Fix most clang -Wall warnings

1 files changed, 188 insertions, 115 deletions

diff --git a/ZAPD/ZCutscene.cpp b/ZAPD/ZCutscene.cpp
index afd1b47..b87dd6c 100644
--- a/ZAPD/ZCutscene.cpp
+++ b/ZAPD/ZCutscene.cpp
@@ -16,21 +16,90 @@ ZCutscene::~ZCutscene()
 	for (CutsceneCommand* cmd : commands)
 		delete cmd;
 }
+CutsceneCommandSetCameraPos::~CutsceneCommandSetCameraPos()
+{
+	for(auto e : entries)
+		delete e;
+}
+
+CutsceneCommandSpecialAction::~CutsceneCommandSpecialAction()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandFadeBGM::~CutsceneCommandFadeBGM()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandPlayBGM::~CutsceneCommandPlayBGM()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandStopBGM::~CutsceneCommandStopBGM()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandEnvLighting::~CutsceneCommandEnvLighting()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandUnknown9::~CutsceneCommandUnknown9()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandUnknown::~CutsceneCommandUnknown()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandDayTime::~CutsceneCommandDayTime()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandTextbox::~CutsceneCommandTextbox()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandActorAction::~CutsceneCommandActorAction()
+{
+	for (auto e: entries)
+		delete e;
+}
+
+CutsceneCommandSceneTransFX::~CutsceneCommandSceneTransFX()
+{
+}
 
 string ZCutscene::GetBodySourceCode()
 {
 	string output = "";
-	int size = 0;
-	int32_t curPtr = 0;
+	size_t size = 0;
+	uint32_t curPtr = 0;
 
 	output += StringHelper::Sprintf("    CS_BEGIN_CUTSCENE(%i, %i),\n", commands.size(), endFrame);
 
-	for (int i = 0; i < commands.size(); i++)
+	for (size_t i = 0; i < commands.size(); i++)
 	{
 		CutsceneCommand* cmd = commands[i];
 		output += "    " + cmd->GenerateSourceCode(curPtr);
-		curPtr += (uint32_t)cmd->GetCommandSize();
-		size += (int)cmd->GetCommandSize();
+		curPtr += cmd->GetCommandSize();
+		size += cmd->GetCommandSize();
 	}
 
 	output += StringHelper::Sprintf("    CS_END(),\n", commands.size(), endFrame);
@@ -65,17 +134,17 @@ void ZCutscene::DeclareVar(const std::string& prefix, const std::string& bodyStr
 	                            bodyStr);
 }
 
-int ZCutscene::GetRawDataSize()
+size_t ZCutscene::GetRawDataSize()
 {
-	int size = 0;
+	size_t size = 0;
 
 	// Beginning
 	size += 8;
 
-	for (int i = 0; i < commands.size(); i++)
+	for (size_t i = 0; i < commands.size(); i++)
 	{
 		CutsceneCommand* cmd = commands[i];
-		size += (int)cmd->GetCommandSize();
+		size += cmd->GetCommandSize();
 		size += 4;
 	}
 
@@ -86,7 +155,7 @@ int ZCutscene::GetRawDataSize()
 }
 
 void ZCutscene::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
-                               const int nRawDataIndex, const std::string& nRelPath)
+                               const uint32_t nRawDataIndex, const std::string& nRelPath)
 {
 	ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath);
 	DeclareVar(parent->GetName(), "");
@@ -100,9 +169,9 @@ void ZCutscene::ParseRawData()
 	endFrame = BitConverter::ToInt32BE(rawData, rawDataIndex + 4);
 	uint32_t currentPtr = rawDataIndex + 8;
 
-	for (int i = 0; i < numCommands; i++)
+	for (int32_t i = 0; i < numCommands; i++)
 	{
-		int id = BitConverter::ToInt32BE(rawData, currentPtr);
+		int32_t id = BitConverter::ToInt32BE(rawData, currentPtr);
 
 		if (id == -1)
 			break;
@@ -110,9 +179,9 @@ void ZCutscene::ParseRawData()
 		CutsceneCommands cmdID = (CutsceneCommands)GetCommandFromID(id);
 		currentPtr += 4;
 
-		int numEntries = 1;
+		int32_t numEntries = 1;
 
-		for (int j = 0; j < numEntries; j++)
+		for (int32_t j = 0; j < numEntries; j++)
 		{
 			CutsceneCommand* cmd = nullptr;
 
@@ -189,7 +258,7 @@ void ZCutscene::ParseRawData()
 				cmd = new CutsceneCommandEnd(rawData, currentPtr);
 				break;
 			case CutsceneCommands::Error:
-				fprintf(stderr, "Cutscene command error %d  %s  %d\n", (int)cmdID, __FILE__,
+				fprintf(stderr, "Cutscene command error %d  %s  %d\n", (int32_t)cmdID, __FILE__,
 				        __LINE__);
 				break;
 			}
@@ -203,7 +272,7 @@ void ZCutscene::ParseRawData()
 	}
 }
 
-CutsceneCommands ZCutscene::GetCommandFromID(int id)
+CutsceneCommands ZCutscene::GetCommandFromID(int32_t id)
 {
 	switch (id)
 	{
@@ -378,16 +447,20 @@ ZResourceType ZCutscene::GetResourceType()
 	return ZResourceType::Cutscene;
 }
 
-CutsceneCommand::CutsceneCommand(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommand::CutsceneCommand(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 }
 
+CutsceneCommand::~CutsceneCommand(){
+
+}
+
 string CutsceneCommand::GetCName()
 {
 	return "SCmdCutsceneData";
 }
 
-string CutsceneCommand::GenerateSourceCode(int baseAddress)
+string CutsceneCommand::GenerateSourceCode(uint32_t baseAddress)
 {
 	return StringHelper::Sprintf("%s CutsceneData%04XCmd%02X = { 0x%02X,", GetCName().c_str(),
 	                             baseAddress, commandIndex, commandID);
@@ -398,7 +471,7 @@ size_t CutsceneCommand::GetCommandSize()
 	return 4;
 }
 
-CutsceneCameraPoint::CutsceneCameraPoint(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCameraPoint::CutsceneCameraPoint(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	const uint8_t* data = rawData.data();
 
@@ -415,15 +488,15 @@ CutsceneCameraPoint::CutsceneCameraPoint(const vector<uint8_t>& rawData, int raw
 }
 
 CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const vector<uint8_t>& rawData,
-                                                         int rawDataIndex)
+                                                         uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
 	const uint8_t* data = rawData.data();
 
-	base = (uint16_t)BitConverter::ToInt16BE(data, rawDataIndex + 0);
-	startFrame = (uint16_t)BitConverter::ToInt16BE(data, rawDataIndex + 2);
-	endFrame = (uint16_t)BitConverter::ToInt16BE(data, rawDataIndex + 4);
-	unused = (uint16_t)BitConverter::ToInt16BE(data, rawDataIndex + 6);
+	base = BitConverter::ToUInt16BE(data, rawDataIndex + 0);
+	startFrame = BitConverter::ToUInt16BE(data, rawDataIndex + 2);
+	endFrame = BitConverter::ToUInt16BE(data, rawDataIndex + 4);
+	unused = BitConverter::ToUInt16BE(data, rawDataIndex + 6);
 
 	entries = vector<CutsceneCameraPoint*>();
 
@@ -449,24 +522,24 @@ string CutsceneCommandSetCameraPos::GetCName()
 	return "";
 }
 
-string CutsceneCommandSetCameraPos::GenerateSourceCode(int baseAddress)
+string CutsceneCommandSetCameraPos::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
 	string listStr = "";
 	string posStr = "";
 
-	if (commandID == (int)CutsceneCommands::SetCameraFocus)
+	if (commandID == (int32_t)CutsceneCommands::SetCameraFocus)
 	{
 		listStr = "CS_CAM_FOCUS_POINT_LIST";
 		posStr = "CS_CAM_FOCUS_POINT";
 	}
-	else if (commandID == (int)CutsceneCommands::SetCameraFocusLink)
+	else if (commandID == (int32_t)CutsceneCommands::SetCameraFocusLink)
 	{
 		listStr = "CS_CAM_FOCUS_POINT_PLAYER_LIST";
 		posStr = "CS_CAM_FOCUS_POINT_PLAYER";
 	}
-	else if (commandID == (int)CutsceneCommands::SetCameraPosLink)
+	else if (commandID == (int32_t)CutsceneCommands::SetCameraPosLink)
 	{
 		listStr = "CS_CAM_POS_PLAYER_LIST";
 		posStr = "CS_CAM_POS_PLAYER";
@@ -496,35 +569,35 @@ size_t CutsceneCommandSetCameraPos::GetCommandSize()
 	return 8 + (entries.size() * 16);
 }
 
-MusicFadeEntry::MusicFadeEntry(const vector<uint8_t>& rawData, int rawDataIndex)
-{
-	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
-	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
-	endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4);
-	unknown0 = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 6);
-	unknown1 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 8);
-	unknown2 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 12);
-	unknown3 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 16);
-	unknown4 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 20);
-	unknown5 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 24);
-	unknown6 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 28);
-	unknown7 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 32);
-	unknown8 = (uint32_t)BitConverter::ToInt32BE(rawData,
-	                                             rawDataIndex + 36);  // Macro hardcodes it as zero
-	unknown9 = (uint32_t)BitConverter::ToInt32BE(rawData,
-	                                             rawDataIndex + 40);  // Macro hardcodes it as zero
-	unknown10 = (uint32_t)BitConverter::ToInt32BE(rawData,
-	                                              rawDataIndex + 44);  // Macro hardcodes it as zero
-}
-
-CutsceneCommandFadeBGM::CutsceneCommandFadeBGM(const vector<uint8_t>& rawData, int rawDataIndex)
+MusicFadeEntry::MusicFadeEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
+{
+	base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0);
+	startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2);
+	endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4);
+	unknown0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6);
+	unknown1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8);
+	unknown2 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12);
+	unknown3 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 16);
+	unknown4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 20);
+	unknown5 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 24);
+	unknown6 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 28);
+	unknown7 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 32);
+	unknown8 = BitConverter::ToUInt32BE(rawData,
+	                                    rawDataIndex + 36);  // Macro hardcodes it as zero
+	unknown9 = BitConverter::ToUInt32BE(rawData,
+	                                    rawDataIndex + 40);  // Macro hardcodes it as zero
+	unknown10 = BitConverter::ToUInt32BE(rawData,
+	                                     rawDataIndex + 44);  // Macro hardcodes it as zero
+}
+
+CutsceneCommandFadeBGM::CutsceneCommandFadeBGM(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
+	uint32_t numEntries = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (uint32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new MusicFadeEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
@@ -536,7 +609,7 @@ string CutsceneCommandFadeBGM::GetCName()
 	return "CsCmdMusicFade";
 }
 
-string CutsceneCommandFadeBGM::GenerateSourceCode(int baseAddress)
+string CutsceneCommandFadeBGM::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -559,36 +632,36 @@ size_t CutsceneCommandFadeBGM::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + 0x30 * entries.size();
 }
 
-MusicChangeEntry::MusicChangeEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+MusicChangeEntry::MusicChangeEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
-	sequence = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
-	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
-	endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4);
-	unknown0 = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 6);
-	unknown1 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 8);
-	unknown2 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 12);
-	unknown3 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 16);
-	unknown4 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 20);
-	unknown5 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 24);
-	unknown6 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 28);
-	unknown7 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 32);
+	sequence = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0);
+	startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2);
+	endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4);
+	unknown0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6);
+	unknown1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8);
+	unknown2 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12);
+	unknown3 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 16);
+	unknown4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 20);
+	unknown5 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 24);
+	unknown6 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 28);
+	unknown7 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 32);
 }
 
-CutsceneCommandPlayBGM::CutsceneCommandPlayBGM(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandPlayBGM::CutsceneCommandPlayBGM(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
+	uint32_t numEntries = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (uint32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new MusicChangeEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandPlayBGM::GenerateSourceCode(int baseAddress)
+string CutsceneCommandPlayBGM::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -616,21 +689,21 @@ size_t CutsceneCommandPlayBGM::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + 0x30;
 }
 
-CutsceneCommandStopBGM::CutsceneCommandStopBGM(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandStopBGM::CutsceneCommandStopBGM(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
+	uint32_t numEntries = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (uint32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new MusicChangeEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandStopBGM::GenerateSourceCode(int baseAddress)
+string CutsceneCommandStopBGM::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -658,7 +731,7 @@ size_t CutsceneCommandStopBGM::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + 0x30;
 }
 
-EnvLightingEntry::EnvLightingEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+EnvLightingEntry::EnvLightingEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	setting = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
 	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
@@ -674,21 +747,21 @@ EnvLightingEntry::EnvLightingEntry(const vector<uint8_t>& rawData, int rawDataIn
 }
 
 CutsceneCommandEnvLighting::CutsceneCommandEnvLighting(const vector<uint8_t>& rawData,
-                                                       int rawDataIndex)
+                                                       uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new EnvLightingEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandEnvLighting::GenerateSourceCode(int baseAddress)
+string CutsceneCommandEnvLighting::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -716,7 +789,7 @@ size_t CutsceneCommandEnvLighting::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (0x30 * entries.size());
 }
 
-Unknown9Entry::Unknown9Entry(const vector<uint8_t>& rawData, int rawDataIndex)
+Unknown9Entry::Unknown9Entry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
 	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
@@ -729,21 +802,21 @@ Unknown9Entry::Unknown9Entry(const vector<uint8_t>& rawData, int rawDataIndex)
 	;
 }
 
-CutsceneCommandUnknown9::CutsceneCommandUnknown9(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandUnknown9::CutsceneCommandUnknown9(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new Unknown9Entry(rawData, rawDataIndex));
 		rawDataIndex += 0x0C;
 	}
 }
 
-string CutsceneCommandUnknown9::GenerateSourceCode(int baseAddress)
+string CutsceneCommandUnknown9::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -770,7 +843,7 @@ size_t CutsceneCommandUnknown9::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (entries.size() * 12);
 }
 
-UnkEntry::UnkEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+UnkEntry::UnkEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	unused0 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
 	unused1 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 4);
@@ -786,21 +859,21 @@ UnkEntry::UnkEntry(const vector<uint8_t>& rawData, int rawDataIndex)
 	unused11 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 44);
 }
 
-CutsceneCommandUnknown::CutsceneCommandUnknown(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandUnknown::CutsceneCommandUnknown(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new UnkEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandUnknown::GenerateSourceCode(int baseAddress)
+string CutsceneCommandUnknown::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -828,7 +901,7 @@ size_t CutsceneCommandUnknown::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (entries.size() * 0x30);
 }
 
-DayTimeEntry::DayTimeEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+DayTimeEntry::DayTimeEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
 	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
@@ -838,14 +911,14 @@ DayTimeEntry::DayTimeEntry(const vector<uint8_t>& rawData, int rawDataIndex)
 	unused = rawData[rawDataIndex + 8];
 }
 
-CutsceneCommandDayTime::CutsceneCommandDayTime(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandDayTime::CutsceneCommandDayTime(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new DayTimeEntry(rawData, rawDataIndex));
 		rawDataIndex += 12;
@@ -857,7 +930,7 @@ string CutsceneCommandDayTime::GetCName()
 	return "CsCmdDayTime";
 }
 
-string CutsceneCommandDayTime::GenerateSourceCode(int baseAddress)
+string CutsceneCommandDayTime::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -878,7 +951,7 @@ size_t CutsceneCommandDayTime::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (entries.size() * 12);
 }
 
-TextboxEntry::TextboxEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+TextboxEntry::TextboxEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
 	startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2);
@@ -888,14 +961,14 @@ TextboxEntry::TextboxEntry(const vector<uint8_t>& rawData, int rawDataIndex)
 	textID2 = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 10);
 }
 
-CutsceneCommandTextbox::CutsceneCommandTextbox(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandTextbox::CutsceneCommandTextbox(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new TextboxEntry(rawData, rawDataIndex));
 		rawDataIndex += 12;
@@ -907,7 +980,7 @@ string CutsceneCommandTextbox::GetCName()
 	return "CsCmdTextbox";
 }
 
-string CutsceneCommandTextbox::GenerateSourceCode(int baseAddress)
+string CutsceneCommandTextbox::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -937,7 +1010,7 @@ size_t CutsceneCommandTextbox::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (entries.size() * 12);
 }
 
-ActorAction::ActorAction(const vector<uint8_t>& rawData, int rawDataIndex)
+ActorAction::ActorAction(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	const uint8_t* data = rawData.data();
 
@@ -959,21 +1032,21 @@ ActorAction::ActorAction(const vector<uint8_t>& rawData, int rawDataIndex)
 }
 
 CutsceneCommandActorAction::CutsceneCommandActorAction(const vector<uint8_t>& rawData,
-                                                       int rawDataIndex)
+                                                       uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new ActorAction(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandActorAction::GenerateSourceCode(int baseAddress)
+string CutsceneCommandActorAction::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 	string subCommand = "";
@@ -1015,7 +1088,7 @@ size_t CutsceneCommandActorAction::GetCommandSize()
 }
 
 CutsceneCommandTerminator::CutsceneCommandTerminator(const vector<uint8_t>& rawData,
-                                                     int rawDataIndex)
+                                                     uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
 	rawDataIndex += 4;
@@ -1031,7 +1104,7 @@ string CutsceneCommandTerminator::GetCName()
 	return "CsCmdBase";
 }
 
-string CutsceneCommandTerminator::GenerateSourceCode(int baseAddress)
+string CutsceneCommandTerminator::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -1045,7 +1118,7 @@ size_t CutsceneCommandTerminator::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + 8;
 }
 
-CutsceneCommandEnd::CutsceneCommandEnd(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandEnd::CutsceneCommandEnd(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
 	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
@@ -1053,7 +1126,7 @@ CutsceneCommandEnd::CutsceneCommandEnd(const vector<uint8_t>& rawData, int rawDa
 	endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4);
 }
 
-string CutsceneCommandEnd::GenerateSourceCode(int baseAddress)
+string CutsceneCommandEnd::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -1072,7 +1145,7 @@ size_t CutsceneCommandEnd::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + 6;
 }
 
-SpecialActionEntry::SpecialActionEntry(const vector<uint8_t>& rawData, int rawDataIndex)
+SpecialActionEntry::SpecialActionEntry(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 {
 	const uint8_t* data = rawData.data();
 
@@ -1093,21 +1166,21 @@ SpecialActionEntry::SpecialActionEntry(const vector<uint8_t>& rawData, int rawDa
 }
 
 CutsceneCommandSpecialAction::CutsceneCommandSpecialAction(const vector<uint8_t>& rawData,
-                                                           int rawDataIndex)
+                                                           uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
-	int numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
+	int32_t numEntries = BitConverter::ToInt32BE(rawData, rawDataIndex + 0);
 
 	rawDataIndex += 4;
 
-	for (int i = 0; i < numEntries; i++)
+	for (int32_t i = 0; i < numEntries; i++)
 	{
 		entries.push_back(new SpecialActionEntry(rawData, rawDataIndex));
 		rawDataIndex += 0x30;
 	}
 }
 
-string CutsceneCommandSpecialAction::GenerateSourceCode(int baseAddress)
+string CutsceneCommandSpecialAction::GenerateSourceCode(uint32_t baseAddress)
 {
 	string result = "";
 
@@ -1137,7 +1210,7 @@ size_t CutsceneCommandSpecialAction::GetCommandSize()
 	return CutsceneCommand::GetCommandSize() + (0x30 * entries.size());
 }
 
-CutsceneCommandNop::CutsceneCommandNop(const vector<uint8_t>& rawData, int rawDataIndex)
+CutsceneCommandNop::CutsceneCommandNop(const vector<uint8_t>& rawData, uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
 	base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0);
@@ -1156,7 +1229,7 @@ size_t CutsceneCommandNop::GetCommandSize()
 }
 
 CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const vector<uint8_t>& rawData,
-                                                         int rawDataIndex)
+                                                         uint32_t rawDataIndex)
 	: CutsceneCommand(rawData, rawDataIndex)
 {
 	rawDataIndex += 4;
@@ -1166,7 +1239,7 @@ CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const vector<uint8_t>&
 	endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4);
 }
 
-string CutsceneCommandSceneTransFX::GenerateSourceCode(int baseAddress)
+string CutsceneCommandSceneTransFX::GenerateSourceCode(uint32_t baseAddress)
 {
 	return StringHelper::Sprintf("CS_SCENE_TRANS_FX(%i, %i, %i),\n", base, startFrame, endFrame);
 }