From b681042eb84a0a59d6f4a3a7606ac00ea7749308 Mon Sep 17 00:00:00 2001 From: Zegeri Date: Mon, 30 Jun 2014 14:03:33 +0200 Subject: [PATCH 1/2] Rename SaveEventCommands/unknown_0d to actioned --- generator/csv/fields.csv | 2 +- src/generated/lsd_chunks.h | 4 ++-- src/generated/lsd_saveeventcommands.cpp | 2 +- src/generated/rpg_saveeventcommands.cpp | 2 +- src/generated/rpg_saveeventcommands.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generator/csv/fields.csv b/generator/csv/fields.csv index 307a32ad4..036057257 100644 --- a/generator/csv/fields.csv +++ b/generator/csv/fields.csv @@ -972,7 +972,7 @@ SaveEventCommands,commands_size,f,Integer,0x01,0,int SaveEventCommands,commands,f,Vector,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,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,0x16,,byte SaveEventData,commands,f,Array,0x01,,array diff --git a/src/generated/lsd_chunks.h b/src/generated/lsd_chunks.h index 6d2cc0786..5d5c2b50d 100644 --- a/src/generated/lsd_chunks.h +++ b/src/generated/lsd_chunks.h @@ -623,8 +623,8 @@ namespace LSD_Reader { current_command = 0x0B, /** int */ unknown_0c = 0x0C, - /** int */ - unknown_0d = 0x0D, + /** 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 index 083aaa5e3..c7c402cc4 100644 --- a/src/generated/lsd_saveeventcommands.cpp +++ b/src/generated/lsd_saveeventcommands.cpp @@ -21,7 +21,7 @@ LCF_STRUCT_FIELDS_BEGIN() LCF_STRUCT_TYPED_FIELD(std::vector, 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(bool, actioned), LCF_STRUCT_TYPED_FIELD(int, unknown_15), LCF_STRUCT_TYPED_FIELD(std::vector, unknown_16), LCF_STRUCT_FIELDS_END() diff --git a/src/generated/rpg_saveeventcommands.cpp b/src/generated/rpg_saveeventcommands.cpp index 3c92dd649..49ab4eabc 100644 --- a/src/generated/rpg_saveeventcommands.cpp +++ b/src/generated/rpg_saveeventcommands.cpp @@ -17,6 +17,6 @@ RPG::SaveEventCommands::SaveEventCommands() { commands_size = 0; current_command = -1; unknown_0c = -1; - unknown_0d = -1; + actioned = false; unknown_15 = -1; } diff --git a/src/generated/rpg_saveeventcommands.h b/src/generated/rpg_saveeventcommands.h index b3be76029..6c67899f7 100644 --- a/src/generated/rpg_saveeventcommands.h +++ b/src/generated/rpg_saveeventcommands.h @@ -27,7 +27,7 @@ namespace RPG { std::vector commands; int current_command; int unknown_0c; - int unknown_0d; + bool actioned; int unknown_15; std::vector unknown_16; }; From bedb1c928147b007a812999cf1dfcc9d10fb210f Mon Sep 17 00:00:00 2001 From: Zegeri Date: Tue, 1 Jul 2014 12:50:10 +0200 Subject: [PATCH 2/2] Rename SaveEventCommands/unknown_0c to event_id --- generator/csv/fields.csv | 2 +- src/generated/lsd_chunks.h | 4 ++-- src/generated/lsd_saveeventcommands.cpp | 2 +- src/generated/rpg_saveeventcommands.cpp | 2 +- src/generated/rpg_saveeventcommands.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generator/csv/fields.csv b/generator/csv/fields.csv index 036057257..ab99295ab 100644 --- a/generator/csv/fields.csv +++ b/generator/csv/fields.csv @@ -971,7 +971,7 @@ SaveTarget,switch_id,f,Ref,0x05,0,int SaveEventCommands,commands_size,f,Integer,0x01,0,int SaveEventCommands,commands,f,Vector,0x02,,event command list SaveEventCommands,current_command,f,Integer,0x0B,-1,int -SaveEventCommands,unknown_0c,f,Integer,0x0C,-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,0x16,,byte diff --git a/src/generated/lsd_chunks.h b/src/generated/lsd_chunks.h index 5d5c2b50d..c48e380ff 100644 --- a/src/generated/lsd_chunks.h +++ b/src/generated/lsd_chunks.h @@ -621,8 +621,8 @@ namespace LSD_Reader { commands = 0x02, /** int */ current_command = 0x0B, - /** int */ - unknown_0c = 0x0C, + /** 0 if it's common event or in other map */ + event_id = 0x0C, /** Event was triggered by the Action Key */ actioned = 0x0D, /** byte */ diff --git a/src/generated/lsd_saveeventcommands.cpp b/src/generated/lsd_saveeventcommands.cpp index c7c402cc4..a6ff54365 100644 --- a/src/generated/lsd_saveeventcommands.cpp +++ b/src/generated/lsd_saveeventcommands.cpp @@ -20,7 +20,7 @@ LCF_STRUCT_FIELDS_BEGIN() LCF_STRUCT_TYPED_FIELD(int, commands_size), LCF_STRUCT_TYPED_FIELD(std::vector, commands), LCF_STRUCT_TYPED_FIELD(int, current_command), - LCF_STRUCT_TYPED_FIELD(int, unknown_0c), + 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, unknown_16), diff --git a/src/generated/rpg_saveeventcommands.cpp b/src/generated/rpg_saveeventcommands.cpp index 49ab4eabc..e9642ddda 100644 --- 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; + event_id = 0; actioned = false; unknown_15 = -1; } diff --git a/src/generated/rpg_saveeventcommands.h b/src/generated/rpg_saveeventcommands.h index 6c67899f7..dde92b505 100644 --- a/src/generated/rpg_saveeventcommands.h +++ b/src/generated/rpg_saveeventcommands.h @@ -26,7 +26,7 @@ namespace RPG { int commands_size; std::vector commands; int current_command; - int unknown_0c; + int event_id; bool actioned; int unknown_15; std::vector unknown_16;