Merge pull request #114 from Zegeri/master

Identify two SaveEventCommands chunks
EasyRPG · Jul 1, 2014 · f12b80e · f12b80e
2 parents e17108b + bedb1c9
commit f12b80e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/generator/csv/fields.csv b/generator/csv/fields.csv
@@ -971,8 +971,8 @@ SaveTarget,switch_id,f,Ref<Switch>,0x05,0,int
 SaveEventCommands,commands_size,f,Integer,0x01,0,int
 SaveEventCommands,commands,f,Vector<EventCommand>,0x02,,event command list
 SaveEventCommands,current_command,f,Integer,0x0B,-1,int
-SaveEventCommands,unknown_0c,f,Integer,0x0C,-1,int
-SaveEventCommands,unknown_0d,f,Integer,0x0D,-1,int
+SaveEventCommands,event_id,f,Integer,0x0C,0,0 if it's common event or in other map
+SaveEventCommands,actioned,f,Boolean,0x0D,False,Event was triggered by the Action Key
 SaveEventCommands,unknown_15,f,Integer,0x15,-1,byte
 SaveEventCommands,unknown_16,f,Vector<UInt8>,0x16,,byte
 SaveEventData,commands,f,Array<SaveEventCommands>,0x01,,array

diff --git a/src/generated/lsd_chunks.h b/src/generated/lsd_chunks.h
@@ -621,10 +621,10 @@ namespace LSD_Reader {
 			commands		= 0x02,
 			/** int */
 			current_command	= 0x0B,
-			/** int */
-			unknown_0c		= 0x0C,
-			/** int */
-			unknown_0d		= 0x0D,
+			/** 0 if it's common event or in other map */
+			event_id		= 0x0C,
+			/** Event was triggered by the Action Key */
+			actioned		= 0x0D,
 			/** byte */
 			unknown_15		= 0x15,
 			/** byte */

diff --git a/src/generated/lsd_saveeventcommands.cpp b/src/generated/lsd_saveeventcommands.cpp
@@ -20,8 +20,8 @@ LCF_STRUCT_FIELDS_BEGIN()
 	LCF_STRUCT_TYPED_FIELD(int, commands_size),
 	LCF_STRUCT_TYPED_FIELD(std::vector<RPG::EventCommand>, commands),
 	LCF_STRUCT_TYPED_FIELD(int, current_command),
-	LCF_STRUCT_TYPED_FIELD(int, unknown_0c),
-	LCF_STRUCT_TYPED_FIELD(int, unknown_0d),
+	LCF_STRUCT_TYPED_FIELD(int, event_id),
+	LCF_STRUCT_TYPED_FIELD(bool, actioned),
 	LCF_STRUCT_TYPED_FIELD(int, unknown_15),
 	LCF_STRUCT_TYPED_FIELD(std::vector<uint8_t>, unknown_16),
 LCF_STRUCT_FIELDS_END()

diff --git a/src/generated/rpg_saveeventcommands.cpp b/src/generated/rpg_saveeventcommands.cpp
@@ -16,7 +16,7 @@ RPG::SaveEventCommands::SaveEventCommands() {
 	ID = 0;
 	commands_size = 0;
 	current_command = -1;
-	unknown_0c = -1;
-	unknown_0d = -1;
+	event_id = 0;
+	actioned = false;
 	unknown_15 = -1;
 }
diff --git a/src/generated/rpg_saveeventcommands.h b/src/generated/rpg_saveeventcommands.h
@@ -26,8 +26,8 @@ namespace RPG {
 		int commands_size;
 		std::vector<EventCommand> commands;
 		int current_command;
-		int unknown_0c;
-		int unknown_0d;
+		int event_id;
+		bool actioned;
 		int unknown_15;
 		std::vector<uint8_t> unknown_16;
 	};