Merge pull request #1642 from GriffinRichards/bstrings

Add usage of battle strings table offset constant

include/battle_arena.h

@@ -6,7 +6,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state);
 void BattleArena_InitPoints(void);
 void BattleArena_AddMindPoints(u8 battler);
 void BattleArena_AddSkillPoints(u8 battler);
-void BattleArena_DeductMindPoints(u8 battler, u16 stringId);
+void BattleArena_DeductSkillPoints(u8 battler, u16 stringId);
 void DrawArenaRefereeTextBox(void);
 void EraseArenaRefereeTextBox(void);
 

include/constants/battle_string_ids.h

@@ -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.