feat: Add 75 new 'Custom Counters' (26-100)

resources/include/std_zh/std_constants.zh

@@ -75,8 +75,8 @@ DEFINE MAX_FFC			= 128;
 DEFINE MIN_OBJ			= 1; //Short, const for loops.
 
 DEFINE MIN_COUNTER_INDEX		= 0;
-DEFINE MAX_COUNTER_INDEX		= 31;
-DEFINE NUM_COUNTERS			= 32; //0 to 31
+DEFINE MAX_COUNTER_INDEX		= 106;
+DEFINE NUM_COUNTERS			= 107; //0 to 106
 
 DEFINE MIN_COMBO_POS 		= 0;
 DEFINE MAX_COMBO_POS 		= 175;
@@ -441,64 +441,54 @@ DEFINE EXT_NOSHADOW          = 4; // Extended; NPC has no shadow.
 //! We need some better names for Extend constants. 
 
 //Generic counters. Use with itemclass->Counter, Game->Counter[], Game->MCounter[] and Game->DCounter[]
-DEFINE CR_NONE               = -1;
-DEFINE CR_LIFE               = 0;
-DEFINE CR_RUPEES             = 1;
-DEFINE CR_BOMBS              = 2;
-DEFINE CR_ARROWS             = 3;
-DEFINE CR_MAGIC              = 4;
-DEFINE CR_KEYS               = 5;
-DEFINE CR_SBOMBS             = 6;
-DEFINE CR_SCRIPT1            = 7;
-DEFINE CR_SCRIPT2            = 8;
-DEFINE CR_SCRIPT3            = 9;
-DEFINE CR_SCRIPT4            = 10;
-DEFINE CR_SCRIPT5            = 11;
-DEFINE CR_SCRIPT6            = 12;
-DEFINE CR_SCRIPT7            = 13;
-DEFINE CR_SCRIPT8            = 14;
-DEFINE CR_SCRIPT9            = 15;
-DEFINE CR_SCRIPT10           = 16;
-DEFINE CR_SCRIPT11           = 17;
-DEFINE CR_SCRIPT12           = 18;
-DEFINE CR_SCRIPT13           = 19;
-DEFINE CR_SCRIPT14           = 20;
-DEFINE CR_SCRIPT15           = 21;
-DEFINE CR_SCRIPT16           = 22;
-DEFINE CR_SCRIPT17           = 23;
-DEFINE CR_SCRIPT18           = 24;
-DEFINE CR_SCRIPT19           = 25;
-DEFINE CR_SCRIPT20           = 26;
-DEFINE CR_SCRIPT21           = 27;
-DEFINE CR_SCRIPT22           = 28;
-DEFINE CR_SCRIPT23           = 29;
-DEFINE CR_SCRIPT24           = 30;
-DEFINE CR_SCRIPT25           = 31;
-DEFINE CR_CUSTOM1            = 7;
-DEFINE CR_CUSTOM2            = 8;
-DEFINE CR_CUSTOM3            = 9;
-DEFINE CR_CUSTOM4            = 10;
-DEFINE CR_CUSTOM5            = 11;
-DEFINE CR_CUSTOM6            = 12;
-DEFINE CR_CUSTOM7            = 13;
-DEFINE CR_CUSTOM8            = 14;
-DEFINE CR_CUSTOM9            = 15;
-DEFINE CR_CUSTOM10           = 16;
-DEFINE CR_CUSTOM11           = 17;
-DEFINE CR_CUSTOM12           = 18;
-DEFINE CR_CUSTOM13           = 19;
-DEFINE CR_CUSTOM14           = 20;
-DEFINE CR_CUSTOM15           = 21;
-DEFINE CR_CUSTOM16           = 22;
-DEFINE CR_CUSTOM17           = 23;
-DEFINE CR_CUSTOM18           = 24;
-DEFINE CR_CUSTOM19           = 25;
-DEFINE CR_CUSTOM20           = 26;
-DEFINE CR_CUSTOM21           = 27;
-DEFINE CR_CUSTOM22           = 28;
-DEFINE CR_CUSTOM23           = 29;
-DEFINE CR_CUSTOM24           = 30;
-DEFINE CR_CUSTOM25           = 31;
+enum
+{
+	CR_NONE = -1,
+	CR_LIFE, CR_MONEY, CR_BOMBS, CR_ARROWS, CR_MAGIC,
+	CR_KEYS, CR_SBOMBS, CR_CUSTOM1, CR_CUSTOM2, CR_CUSTOM3,
+	CR_CUSTOM4,  CR_CUSTOM5,  CR_CUSTOM6,  CR_CUSTOM7,  CR_CUSTOM8,
+	CR_CUSTOM9,  CR_CUSTOM10, CR_CUSTOM11, CR_CUSTOM12, CR_CUSTOM13,
+	CR_CUSTOM14, CR_CUSTOM15, CR_CUSTOM16, CR_CUSTOM17, CR_CUSTOM18,
+	CR_CUSTOM19, CR_CUSTOM20, CR_CUSTOM21, CR_CUSTOM22, CR_CUSTOM23,
+	CR_CUSTOM24, CR_CUSTOM25, CR_CUSTOM26, CR_CUSTOM27, CR_CUSTOM28,
+	CR_CUSTOM29, CR_CUSTOM30, CR_CUSTOM31, CR_CUSTOM32, CR_CUSTOM33,
+	CR_CUSTOM34, CR_CUSTOM35, CR_CUSTOM36, CR_CUSTOM37, CR_CUSTOM38,
+	CR_CUSTOM39, CR_CUSTOM40, CR_CUSTOM41, CR_CUSTOM42, CR_CUSTOM43,
+	CR_CUSTOM44, CR_CUSTOM45, CR_CUSTOM46, CR_CUSTOM47, CR_CUSTOM48,
+	CR_CUSTOM49, CR_CUSTOM50, CR_CUSTOM51, CR_CUSTOM52, CR_CUSTOM53,
+	CR_CUSTOM54, CR_CUSTOM55, CR_CUSTOM56, CR_CUSTOM57, CR_CUSTOM58,
+	CR_CUSTOM59, CR_CUSTOM60, CR_CUSTOM61, CR_CUSTOM62, CR_CUSTOM63,
+	CR_CUSTOM64, CR_CUSTOM65, CR_CUSTOM66, CR_CUSTOM67, CR_CUSTOM68,
+	CR_CUSTOM69, CR_CUSTOM70, CR_CUSTOM71, CR_CUSTOM72, CR_CUSTOM73,
+	CR_CUSTOM74, CR_CUSTOM75, CR_CUSTOM76, CR_CUSTOM77, CR_CUSTOM78,
+	CR_CUSTOM79, CR_CUSTOM80, CR_CUSTOM81, CR_CUSTOM82, CR_CUSTOM83,
+	CR_CUSTOM84, CR_CUSTOM85, CR_CUSTOM86, CR_CUSTOM87, CR_CUSTOM88,
+	CR_CUSTOM89, CR_CUSTOM90, CR_CUSTOM91, CR_CUSTOM92, CR_CUSTOM93,
+	CR_CUSTOM94, CR_CUSTOM95, CR_CUSTOM96, CR_CUSTOM97, CR_CUSTOM98,
+	CR_CUSTOM99, CR_CUSTOM100,
+	//
+	CR_SCRIPT1 = CR_CUSTOM1, CR_SCRIPT2, CR_SCRIPT3,
+	CR_SCRIPT4,  CR_SCRIPT5,  CR_SCRIPT6,  CR_SCRIPT7,  CR_SCRIPT8,
+	CR_SCRIPT9,  CR_SCRIPT10, CR_SCRIPT11, CR_SCRIPT12, CR_SCRIPT13,
+	CR_SCRIPT14, CR_SCRIPT15, CR_SCRIPT16, CR_SCRIPT17, CR_SCRIPT18,
+	CR_SCRIPT19, CR_SCRIPT20, CR_SCRIPT21, CR_SCRIPT22, CR_SCRIPT23,
+	CR_SCRIPT24, CR_SCRIPT25, CR_SCRIPT26, CR_SCRIPT27, CR_SCRIPT28,
+	CR_SCRIPT29, CR_SCRIPT30, CR_SCRIPT31, CR_SCRIPT32, CR_SCRIPT33,
+	CR_SCRIPT34, CR_SCRIPT35, CR_SCRIPT36, CR_SCRIPT37, CR_SCRIPT38,
+	CR_SCRIPT39, CR_SCRIPT40, CR_SCRIPT41, CR_SCRIPT42, CR_SCRIPT43,
+	CR_SCRIPT44, CR_SCRIPT45, CR_SCRIPT46, CR_SCRIPT47, CR_SCRIPT48,
+	CR_SCRIPT49, CR_SCRIPT50, CR_SCRIPT51, CR_SCRIPT52, CR_SCRIPT53,
+	CR_SCRIPT54, CR_SCRIPT55, CR_SCRIPT56, CR_SCRIPT57, CR_SCRIPT58,
+	CR_SCRIPT59, CR_SCRIPT60, CR_SCRIPT61, CR_SCRIPT62, CR_SCRIPT63,
+	CR_SCRIPT64, CR_SCRIPT65, CR_SCRIPT66, CR_SCRIPT67, CR_SCRIPT68,
+	CR_SCRIPT69, CR_SCRIPT70, CR_SCRIPT71, CR_SCRIPT72, CR_SCRIPT73,
+	CR_SCRIPT74, CR_SCRIPT75, CR_SCRIPT76, CR_SCRIPT77, CR_SCRIPT78,
+	CR_SCRIPT79, CR_SCRIPT80, CR_SCRIPT81, CR_SCRIPT82, CR_SCRIPT83,
+	CR_SCRIPT84, CR_SCRIPT85, CR_SCRIPT86, CR_SCRIPT87, CR_SCRIPT88,
+	CR_SCRIPT89, CR_SCRIPT90, CR_SCRIPT91, CR_SCRIPT92, CR_SCRIPT93,
+	CR_SCRIPT94, CR_SCRIPT95, CR_SCRIPT96, CR_SCRIPT97, CR_SCRIPT98,
+	CR_SCRIPT99, CR_SCRIPT100
+};
 
 //Generic data indices. Use this with Game->Generic[]
 DEFINE GEN_HEARTPIECES        = 0; // Heart Pieces currently possessed

src/base/zdefs.h

@@ -242,7 +242,7 @@ enum {ENC_METHOD_192B104=0, ENC_METHOD_192B105, ENC_METHOD_192B185, ENC_METHOD_2
 #define V_GUYS            47
 #define V_MIDIS            4
 #define V_CHEATS           1
-#define V_SAVEGAME        32
+#define V_SAVEGAME        33
 #define V_COMBOALIASES     4
 #define V_HEROSPRITES      16
 #define V_SUBSCREEN        7
@@ -2530,7 +2530,22 @@ enum
 	crCUSTOM9, crCUSTOM10, crCUSTOM11, crCUSTOM12, crCUSTOM13,
 	crCUSTOM14, crCUSTOM15, crCUSTOM16, crCUSTOM17, crCUSTOM18,
 	crCUSTOM19, crCUSTOM20, crCUSTOM21, crCUSTOM22, crCUSTOM23,
-	crCUSTOM24, crCUSTOM25, MAX_COUNTERS
+	crCUSTOM24, crCUSTOM25, crCUSTOM26, crCUSTOM27, crCUSTOM28,
+	crCUSTOM29, crCUSTOM30, crCUSTOM31, crCUSTOM32, crCUSTOM33,
+	crCUSTOM34, crCUSTOM35, crCUSTOM36, crCUSTOM37, crCUSTOM38,
+	crCUSTOM39, crCUSTOM40, crCUSTOM41, crCUSTOM42, crCUSTOM43,
+	crCUSTOM44, crCUSTOM45, crCUSTOM46, crCUSTOM47, crCUSTOM48,
+	crCUSTOM49, crCUSTOM50, crCUSTOM51, crCUSTOM52, crCUSTOM53,
+	crCUSTOM54, crCUSTOM55, crCUSTOM56, crCUSTOM57, crCUSTOM58,
+	crCUSTOM59, crCUSTOM60, crCUSTOM61, crCUSTOM62, crCUSTOM63,
+	crCUSTOM64, crCUSTOM65, crCUSTOM66, crCUSTOM67, crCUSTOM68,
+	crCUSTOM69, crCUSTOM70, crCUSTOM71, crCUSTOM72, crCUSTOM73,
+	crCUSTOM74, crCUSTOM75, crCUSTOM76, crCUSTOM77, crCUSTOM78,
+	crCUSTOM79, crCUSTOM80, crCUSTOM81, crCUSTOM82, crCUSTOM83,
+	crCUSTOM84, crCUSTOM85, crCUSTOM86, crCUSTOM87, crCUSTOM88,
+	crCUSTOM89, crCUSTOM90, crCUSTOM91, crCUSTOM92, crCUSTOM93,
+	crCUSTOM94, crCUSTOM95, crCUSTOM96, crCUSTOM97, crCUSTOM98,
+	crCUSTOM99, crCUSTOM100, MAX_COUNTERS
 };
 
 #define MAX_SAVED_PORTALS 10000