Document safari reactions, move b string ids to constants

2022-08-23 11:11:50 -04:00
parent a5853a71bd
commit da955aaf64
15 changed files with 41 additions and 44 deletions
@@ -402,8 +402,8 @@ struct BattleStruct
    u8 runTries;
    u8 caughtMonNick[POKEMON_NAME_LENGTH + 1];
    u8 field_78; // unused
-    u8 safariGoNearCounter;
-    u8 safariPkblThrowCounter;
+    u8 safariRockThrowCounter;
+    u8 safariBaitThrowCounter;
    u8 safariEscapeFactor;
    u8 safariCatchFactor;
    u8 linkBattleVsSpriteId_V;
@@ -2,6 +2,7 @@
 #define GUARD_BATTLE_MESSAGE_H

 #include "global.h"
+#include "constants/battle_string_ids.h"

 // for 0xFD

@@ -551,10 +551,11 @@
 #define B_MSG_CREPT_CLOSER    0
 #define B_MSG_CANT_GET_CLOSER 1

-// gSafariPokeblockResultStringIds
-#define B_MSG_MON_WATCHING 0
-#define B_MSG_MON_ANGRY    1
-#define B_MSG_MON_EATING   2
+// gSafariReactionStringIds
+#define B_MSG_MON_WATCHING   0
+#define B_MSG_MON_ANGRY      1
+#define B_MSG_MON_EATING     2
+#define NUM_SAFARI_REACTIONS 3

 // gFlashFireStringIds
 #define B_MSG_FLASH_FIRE_BOOST    0