Merge branch 'master' into doc-trickhouse

5 files changed, 40 insertions, 8 deletions

diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index b97c2aaf2..8e82cfef0 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -1097,6 +1097,14 @@
 #define EC_WORD_UGLY           (EC_GROUP_TRENDY_SAYING << 9) | 0x20
 #define NUM_ADDITIONAL_PHRASES  33
 
+// Special Berry Masters Wife phrases
+#define NOT_SPECIAL_PHRASE          0
+#define PHRASE_GREAT_BATTLE         1
+#define PHRASE_CHALLENGE_CONTEST    2
+#define PHRASE_OVERWHELMING_LATIAS  3
+#define PHRASE_COOL_LATIOS          4
+#define PHRASE_SUPER_HUSTLE         5
+
 #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
 #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
 #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move)
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 1d10e2249..2ac6fe8d6 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -353,8 +353,8 @@
 #define FLAG_UNUSED_MYSTERY_GIFT_0x14D       0x14D
 
 #define FLAG_MIRAGE_TOWER_VISIBLE            0x14E
-#define FLAG_CHOSE_CLAW_FOSSIL               0x14F
-#define FLAG_CHOSE_ROOT_FOSSIL               0x150
+#define FLAG_CHOSE_ROOT_FOSSIL               0x14F
+#define FLAG_CHOSE_CLAW_FOSSIL               0x150
 #define FLAG_RECEIVED_POWDER_JAR             0x151
 
 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152
diff --git a/include/constants/items.h b/include/constants/items.h
index 3a894f8ff..3664f6dd2 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -465,8 +465,17 @@
 #define ITEMS_COUNT 377
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
-#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
-#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
+#define FIRST_BERRY_INDEX             ITEM_CHERI_BERRY
+#define LAST_BERRY_INDEX              ITEM_ENIGMA_BERRY
+#define FIRST_BERRY_MASTER_BERRY      ITEM_POMEG_BERRY
+#define LAST_BERRY_MASTER_BERRY       ITEM_NOMEL_BERRY
+#define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY
+#define LAST_BERRY_MASTER_WIFE_BERRY  ITEM_SITRUS_BERRY
+
+#define NUM_BERRY_MASTER_BERRIES         LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
+#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
+#define NUM_BERRY_MASTER_WIFE_BERRIES    LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
+
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
 
 #define NUM_TECHNICAL_MACHINES 50
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 2f3ce5f71..6d17fc047 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -255,10 +255,10 @@
 #define METATILE_EliteFour_EntryDoor_ClosedBottom   0x20E
 
 // gTileset_InsideShip
-#define METATILE_InsideShip_InTactDoor0_Bottom 0x233
-#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B
-#define METATILE_InsideShip_DoorIndent1        0x21A
-#define METATILE_InsideShip_DoorIndent0        0x234
+#define METATILE_InsideShip_IntactDoor_Bottom_Unlocked 0x22B
+#define METATILE_InsideShip_IntactDoor_Bottom_Locked   0x233
+#define METATILE_InsideShip_DoorIndent_Unlocked        0x21A
+#define METATILE_InsideShip_DoorIndent_Locked          0x234
 
 // gTileset_BattlePike
 #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A
diff --git a/include/constants/mevent.h b/include/constants/mevent.h
new file mode 100644
index 000000000..25bbcdf36
--- /dev/null
+++ b/include/constants/mevent.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_CONSTANTS_MEVENT_H
+#define GUARD_CONSTANTS_MEVENT_H
+
+// mevent2.c
+#define GET_NUM_STAMPS   0
+#define GET_MAX_STAMPS   1
+#define GET_CARD_BATTLES_WON  2
+
+#define GET_NUM_STAMPS_INTERNAL   3
+#define GET_MAX_STAMPS_INTERNAL   4
+#define GET_CARD_BATTLES_WON_INTERNAL  0
+
+#define REQUIRED_CARD_BATTLES 3
+
+#endif //GUARD_MEVENT_H