Merge branch 'master' of github.com:pret/pokefirered into trade

1 files changed, 609 insertions, 0 deletions

diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c
new file mode 100644
index 000000000..cbaa780e6
--- /dev/null
+++ b/src/renewable_hidden_items.c
@@ -0,0 +1,609 @@
+#include "global.h"
+#include "event_data.h"
+#include "random.h"
+#include "constants/maps.h"
+#include "constants/flags.h"
+
+struct RenewableHiddenItemData
+{
+    s8 mapGroup;
+    s8 mapNum;
+    u8 filler[2];
+    u8 rare[8];     // 10%
+    u8 uncommon[8]; // 30%
+    u8 common[8];   // 60%
+};
+
+static void SampleRenewableItemFlags(void);
+
+static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
+    {
+        .mapGroup = MAP_GROUP(ROUTE20),
+        .mapNum = MAP_NUM(ROUTE20),
+        .rare = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_ROUTE20_STARDUST,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE21_NORTH),
+        .mapNum = MAP_NUM(ROUTE21_NORTH),
+        .rare = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_ROUTE21_NORTH_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL),
+        .mapNum = MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL),
+        .rare = {
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION,
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE,
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL,
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING,
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL,
+            HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL),
+        .mapNum = MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL),
+        .rare = {
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION,
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE,
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL,
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING,
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL,
+            HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS),
+        .mapNum = MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS),
+        .rare = {
+            HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4,
+            HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE,
+            HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2,
+            HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_MOON_B1F),
+        .mapNum = MAP_NUM(MT_MOON_B1F),
+        .rare = {
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM,
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2,
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3,
+            HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM,
+            HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2,
+            HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM,
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2,
+            HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(THREE_ISLAND_BERRY_FOREST),
+        .mapNum = MAP_NUM(THREE_ISLAND_BERRY_FOREST),
+        .rare = {
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY
+        },
+        .uncommon = {
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY,
+            0xFF
+        },
+        .common = {
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY,
+            HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(ONE_ISLAND_TREASURE_BEACH),
+        .mapNum = MAP_NUM(ONE_ISLAND_TREASURE_BEACH),
+        .rare = {
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL,
+            HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(THREE_ISLAND_BOND_BRIDGE),
+        .mapNum = MAP_NUM(THREE_ISLAND_BOND_BRIDGE),
+        .rare = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL,
+            HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(FOUR_ISLAND),
+        .mapNum = MAP_NUM(FOUR_ISLAND),
+        .rare = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_FOUR_ISLAND_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR),
+        .mapNum = MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR),
+        .rare = {
+            HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS),
+        .mapNum = MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS),
+        .rare = {
+            HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL,
+            HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST,
+            HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND),
+        .mapNum = MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND),
+        .rare = {
+            HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE,
+            HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(SIX_ISLAND_GREEN_PATH),
+        .mapNum = MAP_NUM(SIX_ISLAND_GREEN_PATH),
+        .rare = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+    {
+        .mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER),
+        .mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER),
+        .rare = {
+            HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .uncommon = {
+            HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        },
+        .common = {
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF,
+            0xFF
+        }
+    },
+};
+
+bool32 sub_815D834(void)
+{
+    // Stubbed out?
+    return FALSE;
+}
+
+void SetAllRenewableItemFlags(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < 15; i++)
+    {
+        const u8 * rare = sRenewableHiddenItems[i].rare;
+        const u8 * uncommon = sRenewableHiddenItems[i].uncommon;
+        const u8 * common = sRenewableHiddenItems[i].common;
+        for (j = 0; j < 8; j++)
+        {
+            if (rare[j] != 0xFF)
+                FlagSet(FLAG_HIDDEN_ITEMS_START + rare[j]);
+            if (uncommon[j] != 0xFF)
+                FlagSet(FLAG_HIDDEN_ITEMS_START + uncommon[j]);
+            if (common[j] != 0xFF)
+                FlagSet(FLAG_HIDDEN_ITEMS_START + common[j]);
+        }
+    }
+}
+
+void IncrementRenewableHiddenItemStepCounter(void)
+{
+    u16 var = VarGet(VAR_RENEWABLE_ITEM_STEP_COUNTER);
+    if (var < 1500)
+    {
+        VarSet(VAR_RENEWABLE_ITEM_STEP_COUNTER, var + 1);
+    }
+}
+
+void TryRegenerateRenewableHiddenItems(void)
+{
+    u8 i;
+    u8 found_map = 0xFF;
+    for (i = 0; i < 15; i++)
+    {
+        if (sRenewableHiddenItems[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && sRenewableHiddenItems[i].mapNum == gSaveBlock1Ptr->location.mapNum)
+            found_map = i;
+    }
+
+    if (found_map == 0xFF)
+        return;
+    if (VarGet(VAR_RENEWABLE_ITEM_STEP_COUNTER) >= 1500)
+    {
+        VarSet(VAR_RENEWABLE_ITEM_STEP_COUNTER, 0);
+        SetAllRenewableItemFlags();
+        SampleRenewableItemFlags();
+    }
+}
+
+static void SampleRenewableItemFlags(void)
+{
+    u8 i, j;
+    const u8 * flags;
+    u16 rval;
+
+    for (i = 0; i < 15; i++)
+    {
+        rval = Random() % 100;
+        if (rval >= 90)
+            flags = sRenewableHiddenItems[i].rare;
+        else if (rval >= 60)
+            flags = sRenewableHiddenItems[i].uncommon;
+        else
+            flags = sRenewableHiddenItems[i].common;
+        for (j = 0; j < 8; j++)
+        {
+            if (flags[j] != 0xFF)
+                FlagClear(FLAG_HIDDEN_ITEMS_START + flags[j]);
+        }
+    }
+}