Add usage of battle strings table offset constant

2022-03-10 10:33:23 -05:00
parent eca5233abe
commit d664135572
8 changed files with 406 additions and 404 deletions
@@ -1,10 +1,6 @@
 #ifndef GUARD_CONSTANTS_BATTLE_STRING_IDS_H
 #define GUARD_CONSTANTS_BATTLE_STRING_IDS_H

-#define BATTLESTRINGS_COUNT     369
-
-#define BATTLESTRINGS_ID_ADDER  12 // all battlestrings have its ID + 12, because first 5 are reserved
-
 #define STRINGID_INTROMSG       0
 #define STRINGID_INTROSENDOUT   1
 #define STRINGID_RETURNMON      2
@@ -383,6 +379,12 @@
 #define STRINGID_TRAINER1WINTEXT            379
 #define STRINGID_TRAINER2WINTEXT            380

+#define BATTLESTRINGS_COUNT                 381
+
+// This is the string id that gBattleStringsTable starts with.
+// String ids before this (e.g. STRINGID_INTROMSG) are not in the table,
+// and are instead handled explicitly by BufferStringBattle.
+#define BATTLESTRINGS_TABLE_START  STRINGID_TRAINER1LOSETEXT

 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.