Added prefix to Friend Area constants

This commit is contained in:
Eduardo Quezada
2026-02-22 18:33:27 -03:00
parent deece80e01
commit 51235bf313
19 changed files with 783 additions and 782 deletions

View File

@@ -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

View File

@@ -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<6F>mon's moveRandomly flag will be set when spawning,
// The chance that a wild Pok<6F>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;
@@ -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;

View File

@@ -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;

View File

@@ -8,7 +8,7 @@
typedef struct WigglytuffShop1Work
{
/* 0x0 */ u8 friendAreas[NUM_FRIEND_AREAS];
/* 0x0 */ u8 friendAreas[FRIEND_AREA_COUNT];
/* 0x3C */ u32 mode;
MenuHeaderWindow s40;