Skip to content

Added prefix to Friend Area constants #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnonymousRandomPerson merged 2 commits into from
Feb 23, 2026
Merged

Added prefix to Friend Area constants #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51235bf
Added prefix to Friend Area constants
AsparagusEduardo Feb 22, 2026
e61a0d0
Wtf happened here
AsparagusEduardo Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
840 changes: 420 additions & 420 deletions data/monster/monster_data.json
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 60 additions & 59 deletions include/constants/friend_area.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,64 +7,65 @@
#define UNLOCK_WONDER_MAIL 2
#define UNLOCK_LEGENDARY_REQUEST 3

#define FRIEND_AREA_NONE 0
#define BOUNTIFUL_SEA 1
#define TREASURE_SEA 2
#define SERENE_SEA 3
#define DEEP_SEA_FLOOR 4
#define DEEP_SEA_CURRENT 5
#define SEAFLOOR_CAVE 6
#define SHALLOW_BEACH 7
#define MT_DEEPGREEN 8
#define MT_CLEFT 9
#define MT_MOONVIEW 10
#define RAINBOW_PEAK 11
#define WILD_PLAINS 12
#define BEAU_PLAINS 13
#define SKY_BLUE_PLAINS 14
#define SAFARI 15
#define SCORCHED_PLAINS 16
#define SACRED_FIELD 17
#define MIST_RISE_FOREST 18
#define FLYAWAY_FOREST 19
#define OVERGROWN_FOREST 20
#define ENERGETIC_FOREST 21
#define MUSHROOM_FOREST 22
#define HEALING_FOREST 23
#define TRANSFORM_FOREST 24
#define SECRETIVE_FOREST 25
#define RUB_A_DUB_RIVER 26
#define TADPOLE_POND 27
#define TURTLESHELL_POND 28
#define MYSTIC_LAKE 29
#define WATERFALL_LAKE 30
#define PEANUT_SWAMP 31
#define POISON_SWAMP 32
#define ECHO_CAVE 33
#define CRYPTIC_CAVE 34
#define DRAGON_CAVE 35
#define BOULDER_CAVE 36
#define JUNGLE 37
#define DECREPIT_LAB 38
#define MT_DISCIPLINE 39
#define THUNDER_MEADOW 40
#define POWER_PLANT 41
#define CRATER 42
#define FURNACE_DESERT 43
#define AGED_CHAMBER_AN 44
#define AGED_CHAMBER_O_EXCLAIM 45
#define ANCIENT_RELIC 46
#define DARKNESS_RIDGE 47
#define FRIGID_CAVERN 48
#define ICE_FLOE_BEACH 49
#define VOLCANIC_PIT 50
#define STRATOS_LOOKOUT 51
#define RAVAGED_FIELD 52
#define MAGNETIC_QUARRY 53
#define LEGENDARY_ISLAND 54
#define SOUTHERN_ISLAND 55
#define ENCLOSED_ISLAND 56
#define FINAL_ISLAND 57
#define NUM_FRIEND_AREAS 58
#define FRIEND_AREA_NONE 0
#define FRIEND_AREA_BOUNTIFUL_SEA 1
#define FRIEND_AREA_TREASURE_SEA 2
#define FRIEND_AREA_SERENE_SEA 3
#define FRIEND_AREA_DEEP_SEA_FLOOR 4
#define FRIEND_AREA_DEEP_SEA_CURRENT 5
#define FRIEND_AREA_SEAFLOOR_CAVE 6
#define FRIEND_AREA_SHALLOW_BEACH 7
#define FRIEND_AREA_MT_DEEPGREEN 8
#define FRIEND_AREA_MT_CLEFT 9
#define FRIEND_AREA_MT_MOONVIEW 10
#define FRIEND_AREA_RAINBOW_PEAK 11
#define FRIEND_AREA_WILD_PLAINS 12
#define FRIEND_AREA_BEAU_PLAINS 13
#define FRIEND_AREA_SKY_BLUE_PLAINS 14
#define FRIEND_AREA_SAFARI 15
#define FRIEND_AREA_SCORCHED_PLAINS 16
#define FRIEND_AREA_SACRED_FIELD 17
#define FRIEND_AREA_MIST_RISE_FOREST 18
#define FRIEND_AREA_FLYAWAY_FOREST 19
#define FRIEND_AREA_OVERGROWN_FOREST 20
#define FRIEND_AREA_ENERGETIC_FOREST 21
#define FRIEND_AREA_MUSHROOM_FOREST 22
#define FRIEND_AREA_HEALING_FOREST 23
#define FRIEND_AREA_TRANSFORM_FOREST 24
#define FRIEND_AREA_SECRETIVE_FOREST 25
#define FRIEND_AREA_RUB_A_DUB_RIVER 26
#define FRIEND_AREA_TADPOLE_POND 27
#define FRIEND_AREA_TURTLESHELL_POND 28
#define FRIEND_AREA_MYSTIC_LAKE 29
#define FRIEND_AREA_WATERFALL_LAKE 30
#define FRIEND_AREA_PEANUT_SWAMP 31
#define FRIEND_AREA_POISON_SWAMP 32
#define FRIEND_AREA_ECHO_CAVE 33
#define FRIEND_AREA_CRYPTIC_CAVE 34
#define FRIEND_AREA_DRAGON_CAVE 35
#define FRIEND_AREA_BOULDER_CAVE 36
#define FRIEND_AREA_JUNGLE 37
#define FRIEND_AREA_DECREPIT_LAB 38
#define FRIEND_AREA_MT_DISCIPLINE 39
#define FRIEND_AREA_THUNDER_MEADOW 40
#define FRIEND_AREA_POWER_PLANT 41
#define FRIEND_AREA_CRATER 42
#define FRIEND_AREA_FURNACE_DESERT 43
#define FRIEND_AREA_AGED_CHAMBER_AN 44
#define FRIEND_AREA_AGED_CHAMBER_O_EXCLAIM 45
#define FRIEND_AREA_ANCIENT_RELIC 46
#define FRIEND_AREA_DARKNESS_RIDGE 47
#define FRIEND_AREA_FRIGID_CAVERN 48
#define FRIEND_AREA_ICE_FLOE_BEACH 49
#define FRIEND_AREA_VOLCANIC_PIT 50
#define FRIEND_AREA_STRATOS_LOOKOUT 51
#define FRIEND_AREA_RAVAGED_FIELD 52
#define FRIEND_AREA_MAGNETIC_QUARRY 53
#define FRIEND_AREA_LEGENDARY_ISLAND 54
#define FRIEND_AREA_SOUTHERN_ISLAND 55
#define FRIEND_AREA_ENCLOSED_ISLAND 56
#define FRIEND_AREA_FINAL_ISLAND 57

#define FRIEND_AREA_COUNT 58

#endif
4 changes: 2 additions & 2 deletions include/dungeon_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ typedef struct DungeonDataEntry
/* 0xA */ bool8 enterWithoutGameSave; // If false, the dungeon will force a quicksave before entering.
/* 0xB */ u8 HMMask; // HM mask for dungeon entry requirements (Fly, Dive, Waterfall, Surf, Water).
/* 0xC */ s16 turnLimit;
// The chance that a wild Pok�mon's moveRandomly flag will be set when spawning,
// The chance that a wild Pokémon's moveRandomly flag will be set when spawning,
// causing them to move randomly inside a room instead of exploring rooms.
/* 0xE */ s16 randomMovementChance;
} DungeonDataEntry;
Expand All @@ -42,7 +42,7 @@ extern const s32 gReqIQSkillPts[NUM_IQ_SKILLS];
extern const s32 gUnknown_810A3F0[100];
extern const s16 gTypeGummiIQBoost[NUM_TYPES][NUMBER_OF_GUMMIS];
extern const s16 gUnknown_810A808[NUM_TYPES][NUMBER_OF_GUMMIS];
extern const FriendAreaSettings gFriendAreaSettings[NUM_FRIEND_AREAS];
extern const FriendAreaSettings gFriendAreaSettings[FRIEND_AREA_COUNT];
extern const s16 gPowerBandBoost;
extern const s16 gSpecialBandBoost;
extern const s16 gDefScarfBoost;
Expand Down
4 changes: 2 additions & 2 deletions include/strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ extern const u8 *const gUnknown_8113990;
extern const u8 *const gUnknown_81139B4;
extern const u8 *const gUnknown_81139B8;
extern const u8 *const gText_ItemAlignedX;
extern const u8 *const gFriendAreaNames[NUM_FRIEND_AREAS];
extern const u8 *const gFriendAreaDescriptions[NUM_FRIEND_AREAS];
extern const u8 *const gFriendAreaNames[FRIEND_AREA_COUNT];
extern const u8 *const gFriendAreaDescriptions[FRIEND_AREA_COUNT];
extern const u8 *const gUnknown_8115718[100];
extern const u8 *const gText_PP_Value0;
extern const u8 *const gText_TooManyMembersToEnterDungeon;
Expand Down
2 changes: 1 addition & 1 deletion include/wigglytuff_shop1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

typedef struct WigglytuffShop1Work
{
/* 0x0 */ u8 friendAreas[NUM_FRIEND_AREAS];
/* 0x0 */ u8 friendAreas[FRIEND_AREA_COUNT];
/* 0x3C */ u32 mode;
MenuHeaderWindow s40;

Expand Down
6 changes: 3 additions & 3 deletions src/code_80958E8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ bool8 ValidateWonderMail(WonderMail *data)
return FALSE;

// Friend Area Reward
if(data->friendAreaReward > FINAL_ISLAND)
if(data->friendAreaReward > FRIEND_AREA_FINAL_ISLAND)
return FALSE;

if(data->rewardType == FRIEND_AREA)
Expand Down Expand Up @@ -367,10 +367,10 @@ static u8 sub_8095E78(void)
s32 friendAreaIndex;
s32 counter;

u8 friendAreaStack[NUM_FRIEND_AREAS];
u8 friendAreaStack[FRIEND_AREA_COUNT];

counter = 0;
for(friendAreaIndex = BOUNTIFUL_SEA; friendAreaIndex < NUM_FRIEND_AREAS; friendAreaIndex++)
for(friendAreaIndex = FRIEND_AREA_BOUNTIFUL_SEA; friendAreaIndex < FRIEND_AREA_COUNT; friendAreaIndex++)
{
if ((!gFriendAreas[friendAreaIndex]) &&
(GetFriendAreaUnlockCondition(friendAreaIndex) == UNLOCK_WONDER_MAIL)) {
Expand Down
116 changes: 58 additions & 58 deletions src/data/event_flag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,63 +99,63 @@ struct MapIdToFriendAreaIdStruct
u8 friendAreaId;
};

static const struct MapIdToFriendAreaIdStruct sMapIdToFriendAreaIdTable[NUM_FRIEND_AREAS] = {
{MAP_FRIEND_AREA_BOUNTIFUL_SEA, BOUNTIFUL_SEA},
{MAP_FRIEND_AREA_TREASURE_SEA, TREASURE_SEA},
{MAP_FRIEND_AREA_SERENE_SEA, SERENE_SEA},
{MAP_FRIEND_AREA_DEEP_SEA_FLOOR, DEEP_SEA_FLOOR},
{MAP_FRIEND_AREA_DEEP_SEA_CURRENT, DEEP_SEA_CURRENT},
{MAP_FRIEND_AREA_SEAFLOOR_CAVE, SEAFLOOR_CAVE},
{MAP_FRIEND_AREA_SHALLOW_BEACH, SHALLOW_BEACH},
{MAP_FRIEND_AREA_MT_DEEPGREEN, MT_DEEPGREEN},
{MAP_FRIEND_AREA_MT_CLEFT, MT_CLEFT},
{MAP_FRIEND_AREA_MT_MOONVIEW, MT_MOONVIEW},
{MAP_FRIEND_AREA_RAINBOW_PEAK, RAINBOW_PEAK},
{MAP_FRIEND_AREA_WILD_PLAINS, WILD_PLAINS},
{MAP_FRIEND_AREA_BEAU_PLAINS, BEAU_PLAINS},
{MAP_FRIEND_AREA_SKY_BLUE_PLAINS, SKY_BLUE_PLAINS},
{MAP_FRIEND_AREA_SAFARI, SAFARI},
{MAP_FRIEND_AREA_SCORCHED_PLAINS, SCORCHED_PLAINS},
{MAP_FRIEND_AREA_SACRED_FIELD, SACRED_FIELD},
{MAP_FRIEND_AREA_MIST_RISE_FOREST, MIST_RISE_FOREST},
{MAP_FRIEND_AREA_FLYAWAY_FOREST, FLYAWAY_FOREST},
{MAP_FRIEND_AREA_OVERGROWN_FOREST, OVERGROWN_FOREST},
{MAP_FRIEND_AREA_ENERGETIC_FOREST, ENERGETIC_FOREST},
{MAP_FRIEND_AREA_MUSHROOM_FOREST, MUSHROOM_FOREST},
{MAP_FRIEND_AREA_HEALING_FOREST, HEALING_FOREST},
{MAP_FRIEND_AREA_TRANSFORM_FOREST, TRANSFORM_FOREST},
{MAP_FRIEND_AREA_SECRETIVE_FOREST, SECRETIVE_FOREST},
{MAP_FRIEND_AREA_RUB_A_DUB_RIVER, RUB_A_DUB_RIVER},
{MAP_FRIEND_AREA_TADPOLE_POND, TADPOLE_POND},
{MAP_FRIEND_AREA_TURTLESHELL_POND, TURTLESHELL_POND},
{MAP_FRIEND_AREA_MYSTIC_LAKE, MYSTIC_LAKE},
{MAP_FRIEND_AREA_WATERFALL_LAKE, WATERFALL_LAKE},
{MAP_FRIEND_AREA_PEANUT_SWAMP, PEANUT_SWAMP},
{MAP_FRIEND_AREA_POISON_SWAMP, POISON_SWAMP},
{MAP_FRIEND_AREA_ECHO_CAVE, ECHO_CAVE},
{MAP_FRIEND_AREA_CRYPTIC_CAVE, CRYPTIC_CAVE},
{MAP_FRIEND_AREA_DRAGON_CAVE, DRAGON_CAVE},
{MAP_FRIEND_AREA_BOULDER_CAVE, BOULDER_CAVE},
{MAP_FRIEND_AREA_JUNGLE, JUNGLE},
{MAP_FRIEND_AREA_DECREPIT_LAB, DECREPIT_LAB},
{MAP_FRIEND_AREA_MT_DISCIPLINE, MT_DISCIPLINE},
{MAP_FRIEND_AREA_THUNDER_MEADOW, THUNDER_MEADOW},
{MAP_FRIEND_AREA_POWER_PLANT, POWER_PLANT},
{MAP_FRIEND_AREA_CRATER, CRATER},
{MAP_FRIEND_AREA_FURNACE_DESERT, FURNACE_DESERT},
{MAP_FRIEND_AREA_AGED_CHAMBER_AN, AGED_CHAMBER_AN},
{MAP_FRIEND_AREA_AGED_CHAMBER_O_EXCLAIM, AGED_CHAMBER_O_EXCLAIM},
{MAP_FRIEND_AREA_ANCIENT_RELIC, ANCIENT_RELIC},
{MAP_FRIEND_AREA_DARKNESS_RIDGE, DARKNESS_RIDGE},
{MAP_FRIEND_AREA_FRIGID_CAVERN, FRIGID_CAVERN},
{MAP_FRIEND_AREA_ICE_FLOE_BEACH, ICE_FLOE_BEACH},
{MAP_FRIEND_AREA_VOLCANIC_PIT, VOLCANIC_PIT},
{MAP_FRIEND_AREA_STRATOS_LOOKOUT, STRATOS_LOOKOUT},
{MAP_FRIEND_AREA_RAVAGED_FIELD, RAVAGED_FIELD},
{MAP_FRIEND_AREA_MAGNETIC_QUARRY, MAGNETIC_QUARRY},
{MAP_FRIEND_AREA_LEGENDARY_ISLAND, LEGENDARY_ISLAND},
{MAP_FRIEND_AREA_SOUTHERN_ISLAND, SOUTHERN_ISLAND},
{MAP_FRIEND_AREA_ENCLOSED_ISLAND, ENCLOSED_ISLAND},
{MAP_FRIEND_AREA_FINAL_ISLAND, FINAL_ISLAND},
static const struct MapIdToFriendAreaIdStruct sMapIdToFriendAreaIdTable[FRIEND_AREA_COUNT] = {
{MAP_FRIEND_AREA_BOUNTIFUL_SEA, FRIEND_AREA_BOUNTIFUL_SEA},
{MAP_FRIEND_AREA_TREASURE_SEA, FRIEND_AREA_TREASURE_SEA},
{MAP_FRIEND_AREA_SERENE_SEA, FRIEND_AREA_SERENE_SEA},
{MAP_FRIEND_AREA_DEEP_SEA_FLOOR, FRIEND_AREA_DEEP_SEA_FLOOR},
{MAP_FRIEND_AREA_DEEP_SEA_CURRENT, FRIEND_AREA_DEEP_SEA_CURRENT},
{MAP_FRIEND_AREA_SEAFLOOR_CAVE, FRIEND_AREA_SEAFLOOR_CAVE},
{MAP_FRIEND_AREA_SHALLOW_BEACH, FRIEND_AREA_SHALLOW_BEACH},
{MAP_FRIEND_AREA_MT_DEEPGREEN, FRIEND_AREA_MT_DEEPGREEN},
{MAP_FRIEND_AREA_MT_CLEFT, FRIEND_AREA_MT_CLEFT},
{MAP_FRIEND_AREA_MT_MOONVIEW, FRIEND_AREA_MT_MOONVIEW},
{MAP_FRIEND_AREA_RAINBOW_PEAK, FRIEND_AREA_RAINBOW_PEAK},
{MAP_FRIEND_AREA_WILD_PLAINS, FRIEND_AREA_WILD_PLAINS},
{MAP_FRIEND_AREA_BEAU_PLAINS, FRIEND_AREA_BEAU_PLAINS},
{MAP_FRIEND_AREA_SKY_BLUE_PLAINS, FRIEND_AREA_SKY_BLUE_PLAINS},
{MAP_FRIEND_AREA_SAFARI, FRIEND_AREA_SAFARI},
{MAP_FRIEND_AREA_SCORCHED_PLAINS, FRIEND_AREA_SCORCHED_PLAINS},
{MAP_FRIEND_AREA_SACRED_FIELD, FRIEND_AREA_SACRED_FIELD},
{MAP_FRIEND_AREA_MIST_RISE_FOREST, FRIEND_AREA_MIST_RISE_FOREST},
{MAP_FRIEND_AREA_FLYAWAY_FOREST, FRIEND_AREA_FLYAWAY_FOREST},
{MAP_FRIEND_AREA_OVERGROWN_FOREST, FRIEND_AREA_OVERGROWN_FOREST},
{MAP_FRIEND_AREA_ENERGETIC_FOREST, FRIEND_AREA_ENERGETIC_FOREST},
{MAP_FRIEND_AREA_MUSHROOM_FOREST, FRIEND_AREA_MUSHROOM_FOREST},
{MAP_FRIEND_AREA_HEALING_FOREST, FRIEND_AREA_HEALING_FOREST},
{MAP_FRIEND_AREA_TRANSFORM_FOREST, FRIEND_AREA_TRANSFORM_FOREST},
{MAP_FRIEND_AREA_SECRETIVE_FOREST, FRIEND_AREA_SECRETIVE_FOREST},
{MAP_FRIEND_AREA_RUB_A_DUB_RIVER, FRIEND_AREA_RUB_A_DUB_RIVER},
{MAP_FRIEND_AREA_TADPOLE_POND, FRIEND_AREA_TADPOLE_POND},
{MAP_FRIEND_AREA_TURTLESHELL_POND, FRIEND_AREA_TURTLESHELL_POND},
{MAP_FRIEND_AREA_MYSTIC_LAKE, FRIEND_AREA_MYSTIC_LAKE},
{MAP_FRIEND_AREA_WATERFALL_LAKE, FRIEND_AREA_WATERFALL_LAKE},
{MAP_FRIEND_AREA_PEANUT_SWAMP, FRIEND_AREA_PEANUT_SWAMP},
{MAP_FRIEND_AREA_POISON_SWAMP, FRIEND_AREA_POISON_SWAMP},
{MAP_FRIEND_AREA_ECHO_CAVE, FRIEND_AREA_ECHO_CAVE},
{MAP_FRIEND_AREA_CRYPTIC_CAVE, FRIEND_AREA_CRYPTIC_CAVE},
{MAP_FRIEND_AREA_DRAGON_CAVE, FRIEND_AREA_DRAGON_CAVE},
{MAP_FRIEND_AREA_BOULDER_CAVE, FRIEND_AREA_BOULDER_CAVE},
{MAP_FRIEND_AREA_JUNGLE, FRIEND_AREA_JUNGLE},
{MAP_FRIEND_AREA_DECREPIT_LAB, FRIEND_AREA_DECREPIT_LAB},
{MAP_FRIEND_AREA_MT_DISCIPLINE, FRIEND_AREA_MT_DISCIPLINE},
{MAP_FRIEND_AREA_THUNDER_MEADOW, FRIEND_AREA_THUNDER_MEADOW},
{MAP_FRIEND_AREA_POWER_PLANT, FRIEND_AREA_POWER_PLANT},
{MAP_FRIEND_AREA_CRATER, FRIEND_AREA_CRATER},
{MAP_FRIEND_AREA_FURNACE_DESERT, FRIEND_AREA_FURNACE_DESERT},
{MAP_FRIEND_AREA_AGED_CHAMBER_AN, FRIEND_AREA_AGED_CHAMBER_AN},
{MAP_FRIEND_AREA_AGED_CHAMBER_O_EXCLAIM, FRIEND_AREA_AGED_CHAMBER_O_EXCLAIM},
{MAP_FRIEND_AREA_ANCIENT_RELIC, FRIEND_AREA_ANCIENT_RELIC},
{MAP_FRIEND_AREA_DARKNESS_RIDGE, FRIEND_AREA_DARKNESS_RIDGE},
{MAP_FRIEND_AREA_FRIGID_CAVERN, FRIEND_AREA_FRIGID_CAVERN},
{MAP_FRIEND_AREA_ICE_FLOE_BEACH, FRIEND_AREA_ICE_FLOE_BEACH},
{MAP_FRIEND_AREA_VOLCANIC_PIT, FRIEND_AREA_VOLCANIC_PIT},
{MAP_FRIEND_AREA_STRATOS_LOOKOUT, FRIEND_AREA_STRATOS_LOOKOUT},
{MAP_FRIEND_AREA_RAVAGED_FIELD, FRIEND_AREA_RAVAGED_FIELD},
{MAP_FRIEND_AREA_MAGNETIC_QUARRY, FRIEND_AREA_MAGNETIC_QUARRY},
{MAP_FRIEND_AREA_LEGENDARY_ISLAND, FRIEND_AREA_LEGENDARY_ISLAND},
{MAP_FRIEND_AREA_SOUTHERN_ISLAND, FRIEND_AREA_SOUTHERN_ISLAND},
{MAP_FRIEND_AREA_ENCLOSED_ISLAND, FRIEND_AREA_ENCLOSED_ISLAND},
{MAP_FRIEND_AREA_FINAL_ISLAND, FRIEND_AREA_FINAL_ISLAND},
{ -1, FRIEND_AREA_NONE},
};
Loading