Merge pull request #1475 from GriffinRichards/doc-minor

Label remaining symbols in a few files

4 files changed, 43 insertions, 28 deletions

diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
index 4c3a45dc6..5ade58d50 100644
--- a/include/constants/battle_ai.h
+++ b/include/constants/battle_ai.h
@@ -29,24 +29,24 @@
 #define AI_WEATHER_HAIL 3
 
 // get_how_powerful_move_is
-#define MOVE_POWER_DISCOURAGED  0
+#define MOVE_POWER_OTHER        0
 #define MOVE_NOT_MOST_POWERFUL  1
 #define MOVE_MOST_POWERFUL      2
 
 // script's table id to bit
-#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
-#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
-#define AI_SCRIPT_CHECK_VIABILITY (1 << 2)
-#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
-#define AI_SCRIPT_RISKY (1 << 4)
-#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)
-#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6)
-#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7)
-#define AI_SCRIPT_HP_AWARE (1 << 8)
-#define AI_SCRIPT_UNKNOWN (1 << 9)
+#define AI_SCRIPT_CHECK_BAD_MOVE        (1 << 0)
+#define AI_SCRIPT_TRY_TO_FAINT          (1 << 1)
+#define AI_SCRIPT_CHECK_VIABILITY       (1 << 2)
+#define AI_SCRIPT_SETUP_FIRST_TURN      (1 << 3)
+#define AI_SCRIPT_RISKY                 (1 << 4)
+#define AI_SCRIPT_PREFER_POWER_EXTREMES (1 << 5)
+#define AI_SCRIPT_PREFER_BATON_PASS     (1 << 6)
+#define AI_SCRIPT_DOUBLE_BATTLE         (1 << 7)
+#define AI_SCRIPT_HP_AWARE              (1 << 8)
+#define AI_SCRIPT_TRY_SUNNY_DAY_START   (1 << 9)
 // 10 - 28 are not used
-#define AI_SCRIPT_ROAMING (1 << 29)
-#define AI_SCRIPT_SAFARI (1 << 30)
-#define AI_SCRIPT_FIRST_BATTLE (1 << 31)
+#define AI_SCRIPT_ROAMING               (1 << 29)
+#define AI_SCRIPT_SAFARI                (1 << 30)
+#define AI_SCRIPT_FIRST_BATTLE          (1 << 31)
 
 #endif // GUARD_CONSTANTS_BATTLE_AI_H
diff --git a/include/constants/tv.h b/include/constants/tv.h
index 1b28f6e6e..095a6ddca 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -249,6 +249,21 @@
 #define CONTESTLADYLIVE_STATE_LOST       2
 #define CONTESTLADYLIVE_STATE_LOST_BADLY 3
 
+// TV Show states for Smart Shopper
+#define SMARTSHOPPER_STATE_INTRO           0
+#define SMARTSHOPPER_STATE_CLERK_NORMAL    1
+#define SMARTSHOPPER_STATE_RAND_COMMENT_1  2
+#define SMARTSHOPPER_STATE_RAND_COMMENT_2  3
+#define SMARTSHOPPER_STATE_RAND_COMMENT_3  4
+#define SMARTSHOPPER_STATE_RAND_COMMENT_4  5
+#define SMARTSHOPPER_STATE_SECOND_ITEM     6
+#define SMARTSHOPPER_STATE_THIRD_ITEM      7
+#define SMARTSHOPPER_STATE_DURING_SALE     8
+#define SMARTSHOPPER_STATE_OUTRO_NORMAL    9
+#define SMARTSHOPPER_STATE_IS_VIP         10
+#define SMARTSHOPPER_STATE_CLERK_MAX      11
+#define SMARTSHOPPER_STATE_OUTRO_MAX      12
+
 #define SMARTSHOPPER_NUM_ITEMS 3
 
 #endif //GUARD_CONSTANTS_TV_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 925b4389d..3340da6f5 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -108,19 +108,19 @@ extern const u8 gTVPokemonTodaySuccessfulText08[];
 extern const u8 gTVPokemonTodaySuccessfulText09[];
 extern const u8 gTVPokemonTodaySuccessfulText10[];
 extern const u8 gTVPokemonTodaySuccessfulText11[];
-extern const u8 gTVTodaysSmartShopperText00[];
-extern const u8 gTVTodaysSmartShopperText01[];
-extern const u8 gTVTodaysSmartShopperText02[];
-extern const u8 gTVTodaysSmartShopperText03[];
-extern const u8 gTVTodaysSmartShopperText04[];
-extern const u8 gTVTodaysSmartShopperText05[];
-extern const u8 gTVTodaysSmartShopperText06[];
-extern const u8 gTVTodaysSmartShopperText07[];
-extern const u8 gTVTodaysSmartShopperText08[];
-extern const u8 gTVTodaysSmartShopperText09[];
-extern const u8 gTVTodaysSmartShopperText10[];
-extern const u8 gTVTodaysSmartShopperText11[];
-extern const u8 gTVTodaysSmartShopperText12[];
+extern const u8 SmartShopper_Text_Intro[];
+extern const u8 SmartShopper_Text_ClerkNormal[];
+extern const u8 SmartShopper_Text_RandomComment1[];
+extern const u8 SmartShopper_Text_RandomComment2[];
+extern const u8 SmartShopper_Text_RandomComment3[];
+extern const u8 SmartShopper_Text_RandomComment4[];
+extern const u8 SmartShopper_Text_SecondItem[];
+extern const u8 SmartShopper_Text_ThirdItem[];
+extern const u8 SmartShopper_Text_DuringSale[];
+extern const u8 SmartShopper_Text_OutroNormal[];
+extern const u8 SmartShopper_Text_IsVIP[];
+extern const u8 SmartShopper_Text_ClerkMax[];
+extern const u8 SmartShopper_Text_OutroMax[];
 extern const u8 gTVWorldOfMastersText00[];
 extern const u8 gTVWorldOfMastersText01[];
 extern const u8 gTVWorldOfMastersText02[];
diff --git a/include/region_map.h b/include/region_map.h
index 97364abd8..02d711afa 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -111,7 +111,7 @@ void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y);
 void CB2_OpenFlyMap(void);
 bool8 IsRegionMapZoomed(void);
 void TrySetPlayerIconBlink(void);
-void sub_8123030(u16 color, u32 coeff);
+void BlendRegionMap(u16 color, u32 coeff);
 void SetRegionMapDataForZoom(void);
 
 extern const struct RegionMapLocation gRegionMapEntries[];