atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a display issue with B_SHOW_TYPES (#5201)

Browse source 
* Moved HandleInputChooseTarget and ShowEntireFieldTargets to non-static and added them as cases to ShouldHideTypeIcon

* Made ShouldHideTypeIcon easier to parse

* Made ShouldHideTypeIcon a for loop

* Fixed identation

* Made showTypesControllerFuncs a static const array per https://github.com/rh-hideout/pokeemerald-expansion/pull/5201\#discussion_r1730336265
This commit is contained in:
psf 2024-08-26 12:16:56 -07:00 committed by GitHub
parent 03e0472cbe
commit b6299ac4ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle_controllers.h
View file

@ -313,6 +313,8 @@ void MoveSelectionDestroyCursorAt(u8 cursorPosition);
void PlayerHandleChooseMove(u32 battler); void PlayerHandleChooseMove(u32 battler);
void HandleInputChooseMove(u32 battler); void HandleInputChooseMove(u32 battler);
void HandleInputChooseTarget(u32 battler); void HandleInputChooseTarget(u32 battler);
void HandleInputShowEntireFieldTargets(u32 battler);
void HandleInputShowTargets(u32 battler);
void HandleMoveSwitching(u32 battler); void HandleMoveSwitching(u32 battler);
void HandleChooseMoveAfterDma3(u32 battler); void HandleChooseMoveAfterDma3(u32 battler);

4
src/battle_controller_player.c
View file

@ -593,7 +593,7 @@ static void HideShownTargets(u32 battler)
} }
} }
static void HandleInputShowEntireFieldTargets(u32 battler) void HandleInputShowEntireFieldTargets(u32 battler)
{ {
if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
gPlayerDpadHoldFrames++; gPlayerDpadHoldFrames++;
@ -621,7 +621,7 @@ static void HandleInputShowEntireFieldTargets(u32 battler)
} }
} }
static void HandleInputShowTargets(u32 battler) void HandleInputShowTargets(u32 battler)
{ {
if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
gPlayerDpadHoldFrames++; gPlayerDpadHoldFrames++;

26
src/type_icons.c
View file

@ -471,15 +471,27 @@ static void FreeAllTypeIconResources(void)
} }
} }
static void (* const sShowTypesControllerFuncs[])(u32 battler) =
{
PlayerHandleChooseMove,
HandleChooseMoveAfterDma3,
HandleInputChooseTarget,
HandleInputShowTargets,
HandleInputShowEntireFieldTargets,
HandleMoveSwitching,
HandleInputChooseMove,
};
static bool32 ShouldHideTypeIcon(u32 battlerId) static bool32 ShouldHideTypeIcon(u32 battlerId)
{ {
return gBattlerControllerFuncs[battlerId] != PlayerHandleChooseMove u32 funcIndex;
&& gBattlerControllerFuncs[battlerId] != HandleInputChooseMove
&& gBattlerControllerFuncs[battlerId] != HandleChooseMoveAfterDma3 for (funcIndex = 0; funcIndex < ARRAY_COUNT(sShowTypesControllerFuncs); funcIndex++)
&& gBattlerControllerFuncs[battlerId] != HandleInputChooseMove if (gBattlerControllerFuncs[battlerId] == sShowTypesControllerFuncs[funcIndex])
&& gBattlerControllerFuncs[battlerId] != HandleInputChooseTarget return FALSE;
&& gBattlerControllerFuncs[battlerId] != HandleMoveSwitching
&& gBattlerControllerFuncs[battlerId] != HandleInputChooseMove; return TRUE;
} }
static s32 GetTypeIconHideMovement(bool32 useDoubleBattleCoords, u32 position) static s32 GetTypeIconHideMovement(bool32 useDoubleBattleCoords, u32 position)