Merge branch 'dev' into release

Author: voloved

README.md

@@ -9,6 +9,10 @@ To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your l
 
  ![Example](https://i.imgur.com/KSMvc0h.png)  
 
+## v2.0.0
+ - Secret Bases Able to Have 36 Decorations (Was 16), But Only a Max Base count of 16 (Was 20).
+   - This breaks compatability with sharing Secret Bases with the vanilla game.
+
 ## v1.6.0
  - [Make Multiple Secret Bases](https://github.com/pret/pokeemerald/wiki/Make-Multiple-Secret-Bases)
  - When putting a Pokémon into a new ball, the old ball gets put back into the bag if it's not a Thief Ball nor Master Ball.

graphics/intro/copyright.bin

@@ -45,7 +45,7 @@
 #define POKEBLOCKS_COUNT 40
 #define OBJECT_EVENTS_COUNT 16
 #define MAIL_COUNT (10 + PARTY_SIZE)
-#define SECRET_BASES_COUNT 20
+#define SECRET_BASES_COUNT 16
 #define TV_SHOWS_COUNT 25
 #define POKE_NEWS_COUNT 16
 #define PC_ITEMS_COUNT 50
@@ -58,7 +58,8 @@
 #define BAG_BATTLEITEMS_COUNT 30
 #define BAG_TREASURES_COUNT 18
 #define OBJECT_EVENT_TEMPLATES_COUNT 64
-#define DECOR_MAX_SECRET_BASE 16
+#define DECOR_MAX_SECRET_BASE 36
+#define DECOR_MAX_SECRET_DOLLS 14  // 16 objects allowed. One for the follower. One more for the player.
 #define DECOR_MAX_PLAYERS_HOUSE 12
 #define APPRENTICE_COUNT 4
 #define APPRENTICE_MAX_QUESTIONS 9

graphics/intro/copyright.png

@@ -128,6 +128,7 @@ extern const u8 gText_GoBackPrevMenu[];
 extern const u8 gText_CantPlaceInRoom[];
 extern const u8 gText_NoMoreDecorations[];
 extern const u8 gText_NoMoreDecorations2[];
+extern const u8 gText_NoMoreDolls[];
 extern const u8 gText_InUseAlready[];
 extern const u8 gText_ContinuelDecorating[];
 extern const u8 gText_PlaceItHere[];

include/constants/global.h

@@ -1316,6 +1316,18 @@ static bool8 HasDecorationSpace(void)
     return FALSE;
 }
 
+static u16 GetSpriteAmount(void)
+{
+    u16 i;
+    u16 sprites = 0;
+    for (i = 0; i < sDecorationContext.size; i++)
+    {
+        if (gDecorations[sDecorationContext.items[i]].permission == DECORPERM_SPRITE)
+            sprites++;
+    }
+    return sprites;
+}
+
 static void DecorationItemsMenuAction_AttemptPlace(u8 taskId)
 {
     if (sDecorationContext.isPlayerRoom == TRUE && sCurDecorationCategory != DECORCAT_DOLL && sCurDecorationCategory != DECORCAT_CUSHION)
@@ -1325,7 +1337,13 @@ static void DecorationItemsMenuAction_AttemptPlace(u8 taskId)
     }
     else if (IsSelectedDecorInThePC() == TRUE)
     {
-        if (HasDecorationSpace() == TRUE)
+        if (GetSpriteAmount() >= DECOR_MAX_SECRET_DOLLS)
+        {
+            ConvertIntToDecimalStringN(gStringVar1, DECOR_MAX_SECRET_DOLLS, STR_CONV_MODE_RIGHT_ALIGN, 2);
+            StringExpandPlaceholders(gStringVar4, gText_NoMoreDolls);
+            DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection);
+        }
+        else if (HasDecorationSpace() == TRUE)
         {
             FadeScreen(FADE_TO_BLACK, 0);
             RemoveFollowingPokemon();

include/strings.h

@@ -576,6 +576,7 @@ const u8 gText_ContinuelDecorating[] = _("Continue decorating?");
 const u8 gText_InUseAlready[] = _("This is in use already.");
 const u8 gText_NoMoreDecorations[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.");
 const u8 gText_NoMoreDecorations2[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.");
+const u8 gText_NoMoreDolls[] = _("No more dolls can be placed.\nThe most that can be placed are {STR_VAR_1}.");
 const u8 gText_MustBePlacedOnDesk[] = _("This can't be placed here.\nIt must be on a DESK, etc."); // Unused
 const u8 gText_CantPlaceInRoom[] = _("This decoration can't be placed in\nyour own room.");
 const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can't be thrown away.");