Merge branch 'master' into dodrio_berry_picking

6 files changed, 38 insertions, 11 deletions

diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index e8a2980a5..894bd13b6 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -95,8 +95,6 @@
 // statchange defines
 #define STAT_CHANGE_BS_PTR                  0x1
 #define STAT_CHANGE_NOT_PROTECT_AFFECTED    0x20
-#define STAT_CHANGE_WORKED      0
-#define STAT_CHANGE_DIDNT_WORK  1
 
 // atk48
 #define ATK48_STAT_NEGATIVE         0x1
@@ -104,6 +102,26 @@
 #define ATK48_ONLY_MULTIPLE         0x4
 #define ATK48_DONT_CHECK_LOWER      0x8
 
+// atk49, moveend cases
+#define ATK49_RAGE                              0
+#define ATK49_DEFROST                           1
+#define ATK49_SYNCHRONIZE_TARGET                2
+#define ATK49_MOVE_END_ABILITIES                3
+#define ATK49_STATUS_IMMUNITY_ABILITIES         4
+#define ATK49_SYNCHRONIZE_ATTACKER              5
+#define ATK49_CHOICE_MOVE                       6
+#define ATK49_CHANGED_ITEMS                     7
+#define ATK49_ATTACKER_INVISIBLE                8
+#define ATK49_ATTACKER_VISIBLE                  9
+#define ATK49_TARGET_VISIBLE                    10
+#define ATK49_ITEM_EFFECTS_ALL                  11
+#define ATK49_KINGSROCK_SHELLBELL               12
+#define ATK49_SUBSTITUTE                        13
+#define ATK49_UPDATE_LAST_MOVES                 14
+#define ATK49_MIRROR_MOVE                       15
+#define ATK49_NEXT_TARGET                       16
+#define ATK49_COUNT                             17
+
 #define BIT_HP                      0x1
 #define BIT_ATK                     0x2
 #define BIT_DEF                     0x4
diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h
index 2a80f9a09..b1f9b4cb5 100755
--- a/include/constants/event_object_movement_constants.h
+++ b/include/constants/event_object_movement_constants.h
@@ -242,4 +242,6 @@
 #define MOVEMENT_ACTION_FLY_UP                          0x9C
 #define MOVEMENT_ACTION_FLY_DOWN                        0x9D
 
+#define MOVEMENT_ACTION_STEP_END 0xFE
+
 #endif // GUARD_CONSTANTS_EVENTOBJMV_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index f28af3278..0450e988d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -445,13 +445,14 @@
 #define FLAG_REMATCH_NORMAN                  0x1A2
 #define FLAG_REMATCH_WINONA                  0x1A3
 #define FLAG_REMATCH_TATE_AND_LIZA           0x1A4
-#define FLAG_REMATCH_JUAN                    0x1A5
-#define FLAG_REMATCH_SIDNEY                  0x1A6
-#define FLAG_REMATCH_PHOEBE                  0x1A7
-#define FLAG_REMATCH_GLACIA                  0x1A8
-#define FLAG_REMATCH_DRAKE                   0x1A9
-#define FLAG_REMATCH_WALLACE                 0x1AA
-
+// Note: FLAG_REMATCH_JUAN is handled by FLAG_ENABLE_JUAN_MATCH_CALL instead.
+#define FLAG_REMATCH_SIDNEY                  0x1A5
+#define FLAG_REMATCH_PHOEBE                  0x1A6
+#define FLAG_REMATCH_GLACIA                  0x1A7
+#define FLAG_REMATCH_DRAKE                   0x1A8
+#define FLAG_REMATCH_WALLACE                 0x1A9
+
+#define FLAG_UNUSED_0x1AA                    0x1AA // Unused Flag
 #define FLAG_UNUSED_0x1AB                    0x1AB // Unused Flag
 
 #define FLAG_DEFEATED_DEOXYS                 0x1AC
diff --git a/include/constants/game_stat.h b/include/constants/game_stat.h
index 7ebf3501b..e302f1345 100644
--- a/include/constants/game_stat.h
+++ b/include/constants/game_stat.h
@@ -51,7 +51,7 @@
 #define GAME_STAT_USED_DAYCARE              47
 #define GAME_STAT_RODE_CABLE_CAR            48
 #define GAME_STAT_ENTERED_HOT_SPRINGS       49
-#define GAME_STAT_50                        50
+#define GAME_STAT_NUM_UNION_ROOM_BATTLES    50
 #define GAME_STAT_51                        51
 
 #define NUM_USED_GAME_STATS                 52
diff --git a/include/constants/maps.h b/include/constants/maps.h
index e1e2da992..b849749a9 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -9,4 +9,10 @@
 #define MAP_GROUP(map) (MAP_##map >> 8)
 #define MAP_NUM(map) (MAP_##map & 0xFF)
 
+// These groups are used by pokedex_area_screen.c to find wild
+// pokemon locations.
+#define MAP_GROUP_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY)
+#define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
+#define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
+
 #endif  // GUARD_CONSTANTS_MAPS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 81ae99e1e..20524611b 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -60,7 +60,7 @@
 #define VAR_POISON_STEP_COUNTER              0x402B
 #define VAR_RESET_RTC_ENABLE                 0x402C
 #define VAR_ENIGMA_BERRY_AVAILABLE           0x402D
-#define VAR_UNUSED_0x402E                    0x402E // Unused Var
+#define VAR_0x402E                           0x402E
 
 #define VAR_FRONTIER_MANIAC_FACILITY         0x402F
 #define VAR_FRONTIER_GAMBLER_FACILITY        0x4030