Skip to content
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

Rename DexNav flags and vars #6044

Merged
merged 2 commits into from
Jan 18, 2025
+27 −27
Merged

Rename DexNav flags and vars #6044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c9262d
Rename DexNav flags and vars
Bassoonian Jan 17, 2025
ce0df61
Fix alignment
Bassoonian Jan 17, 2025
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
10 changes: 5 additions & 5 deletions include/config/dexnav.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */

// Flag/var defines
#define FLAG_SYS_DEXNAV_SEARCH 0 // Searching for mon
#define FLAG_SYS_DEXNAV_GET 0 // DexNav shows in start menu
#define FLAG_SYS_DETECTOR_MODE 0 // Allow player to find hidden mons
#define VAR_DEXNAV_SPECIES 0 // Registered DexNav species
#define VAR_DEXNAV_STEP_COUNTER 0 // Steps for finding hidden pokemon
#define DN_FLAG_SEARCHING 0 // Searching for mon
#define DN_FLAG_DEXNAV_GET 0 // DexNav shows in start menu
#define DN_FLAG_DETECTOR_MODE 0 // Allow player to find hidden mons
#define DN_VAR_SPECIES 0 // Registered DexNav species
#define DN_VAR_STEP_COUNTER 0 // Steps for finding hidden pokemon
Bassoonian marked this conversation as resolved.
Show resolved Hide resolved

// Search parameters
#define DEXNAV_TIMEOUT 15 // 15 seconds is the time out. Max of 1092 seconds allowed
Expand Down
36 changes: 18 additions & 18 deletions src/dexnav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
#include "gba/m4a_internal.h"

#if DEXNAV_ENABLED
STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0, FlagSysDexNavSearch_Must_Not_Be_Zero);
STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0, FlagSysDetectorMode_Must_Not_Be_Zero);
STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0, VarDexNavSpecies_Must_Not_Be_Zero);
STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0, VarDexNavStepCounter_Must_Not_Be_Zero);
STATIC_ASSERT(DN_FLAG_SEARCHING != 0, DNFlagSearching_Must_Not_Be_Zero);
STATIC_ASSERT(DN_FLAG_DETECTOR_MODE != 0, DNFlagDetectorMode_Must_Not_Be_Zero);
STATIC_ASSERT(DN_VAR_SPECIES != 0, DNVarSpecies_Must_Not_Be_Zero);
STATIC_ASSERT(DN_VAR_STEP_COUNTER != 0, DNVarStepCounter_Must_Not_Be_Zero);
#endif

// Defines
Expand Down Expand Up @@ -859,7 +859,7 @@ static void Task_SetUpDexNavSearch(u8 taskId)
DexNavUpdateSearchWindow(sDexNavSearchDataPtr->proximity, searchLevel);
}

FlagSet(FLAG_SYS_DEXNAV_SEARCH);
FlagSet(DN_FLAG_SEARCHING);
gPlayerAvatar.creeping = TRUE; //initialize as true in case mon appears beside you
task->tProximity = gSprites[gPlayerAvatar.spriteId].x;
task->tFrameCount = 0;
Expand Down Expand Up @@ -980,9 +980,9 @@ static void DexNavDrawIcons(void)
bool8 TryStartDexNavSearch(void)
{
u8 taskId;
u16 val = VarGet(VAR_DEXNAV_SPECIES);
u16 val = VarGet(DN_VAR_SPECIES);

if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) || (val & DEXNAV_MASK_SPECIES) == SPECIES_NONE)
if (FlagGet(DN_FLAG_SEARCHING) || (val & DEXNAV_MASK_SPECIES) == SPECIES_NONE)
return FALSE;

HideMapNamePopUpWindow();
Expand All @@ -996,7 +996,7 @@ bool8 TryStartDexNavSearch(void)

void EndDexNavSearch(u8 taskId)
{
FlagClear(FLAG_SYS_DEXNAV_SEARCH);
FlagClear(DN_FLAG_SEARCHING);
DestroyTask(taskId);
RemoveDexNavWindowAndGfx();
FieldEffectStop(&gSprites[sDexNavSearchDataPtr->fldEffSpriteId], sDexNavSearchDataPtr->fldEffId);
Expand Down Expand Up @@ -1114,7 +1114,7 @@ static void Task_DexNavSearch(u8 taskId)
CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel,
sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves);

FlagClear(FLAG_SYS_DEXNAV_SEARCH);
FlagClear(DN_FLAG_SEARCHING);
ScriptContext_SetupScript(EventScript_StartDexNavBattle);
Free(sDexNavSearchDataPtr);
DestroyTask(taskId);
Expand Down Expand Up @@ -2018,7 +2018,7 @@ static void DrawSpeciesIcons(void)
species = sDexNavUiDataPtr->hiddenSpecies[i];
x = ROW_HIDDEN_ICON_X + 24 * i;
y = ROW_HIDDEN_ICON_Y;
if (FlagGet(FLAG_SYS_DETECTOR_MODE))
if (FlagGet(DN_FLAG_DETECTOR_MODE))
TryDrawIconInSlot(species, x, y);
else if (species == SPECIES_NONE || species > NUM_SPECIES)
CreateNoDataIcon(x, y);
Expand All @@ -2043,7 +2043,7 @@ static u16 DexNavGetSpecies(void)
species = sDexNavUiDataPtr->landSpecies[sDexNavUiDataPtr->cursorCol + COL_LAND_COUNT];
break;
case ROW_HIDDEN:
if (!FlagGet(FLAG_SYS_DETECTOR_MODE))
if (!FlagGet(DN_FLAG_DETECTOR_MODE))
species = SPECIES_NONE;
else
species = sDexNavUiDataPtr->hiddenSpecies[sDexNavUiDataPtr->cursorCol];
Expand Down Expand Up @@ -2263,7 +2263,7 @@ static bool8 DexNav_DoGfxSetup(void)
gMain.state++;
break;
case 7:
PrintSearchableSpecies(VarGet(VAR_DEXNAV_SPECIES) & DEXNAV_MASK_SPECIES);
PrintSearchableSpecies(VarGet(DN_VAR_SPECIES) & DEXNAV_MASK_SPECIES);
DexNavLoadEncounterData();
gMain.state++;
break;
Expand Down Expand Up @@ -2461,7 +2461,7 @@ static void Task_DexNavMain(u8 taskId)
PlayCry_Script(species, 0);

// create value to store in a var
VarSet(VAR_DEXNAV_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species));
VarSet(DN_VAR_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species));
}
else
{
Expand Down Expand Up @@ -2492,11 +2492,11 @@ static void Task_DexNavMain(u8 taskId)
/////////////////////////
bool8 TryFindHiddenPokemon(void)
{
u16 *stepPtr = GetVarPointer(VAR_DEXNAV_STEP_COUNTER);
u16 *stepPtr = GetVarPointer(DN_VAR_STEP_COUNTER);

if (DEXNAV_ENABLED == 0
|| !FlagGet(FLAG_SYS_DETECTOR_MODE)
|| FlagGet(FLAG_SYS_DEXNAV_SEARCH)
|| !FlagGet(DN_FLAG_DETECTOR_MODE)
|| FlagGet(DN_FLAG_SEARCHING)
|| GetFlashLevel() > 0)
{
if (stepPtr != NULL)
Expand Down Expand Up @@ -2677,8 +2677,8 @@ void TryIncrementSpeciesSearchLevel(u16 dexNum)
void ResetDexNavSearch(void)
{
gSaveBlock3Ptr->dexNavChain = 0; //reset dex nav chaining on new map
VarSet(VAR_DEXNAV_STEP_COUNTER, 0); //reset hidden pokemon step counter
if (FlagGet(FLAG_SYS_DEXNAV_SEARCH))
VarSet(DN_VAR_STEP_COUNTER, 0); //reset hidden pokemon step counter
if (FlagGet(DN_FLAG_SEARCHING))
EndDexNavSearch(FindTaskIdByFunc(Task_DexNavSearch)); //moving to new map ends dexnav search
}

Expand Down
2 changes: 1 addition & 1 deletion src/field_control_avatar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
input->pressedAButton = TRUE;
if (newKeys & B_BUTTON)
input->pressedBButton = TRUE;
if (newKeys & R_BUTTON && !FlagGet(FLAG_SYS_DEXNAV_SEARCH))
if (newKeys & R_BUTTON && !FlagGet(DN_FLAG_SEARCHING))
input->pressedRButton = TRUE;
}

Expand Down
4 changes: 2 additions & 2 deletions src/field_player_avatar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
gPlayerAvatar.creeping = FALSE;
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
{
if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
if (FlagGet(DN_FLAG_SEARCHING) && (heldKeys & A_BUTTON))
{
gPlayerAvatar.creeping = TRUE;
PlayerWalkSlow(direction);
Expand All @@ -693,7 +693,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
return;
}
else if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
else if (FlagGet(DN_FLAG_SEARCHING) && (heldKeys & A_BUTTON))
{
gPlayerAvatar.creeping = TRUE;
PlayerWalkSlow(direction);
Expand Down
2 changes: 1 addition & 1 deletion src/start_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static void BuildNormalStartMenu(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKEDEX);

if (FLAG_SYS_DEXNAV_GET != 0 && FlagGet(FLAG_SYS_DEXNAV_GET))
if (DN_FLAG_DEXNAV_GET != 0 && FlagGet(DN_FLAG_DEXNAV_GET))
AddStartMenuAction(MENU_ACTION_DEXNAV);

if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
Expand Down
Loading