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

Merge branch 'master' into schedule

Browse source
This commit is contained in:
psf 2025-01-03 19:53:33 -08:00 committed by GitHub
commit 5d765e7035
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/install/windows/WSL.md
View file

@ -12,13 +12,13 @@ If you want the best performance and least amount of issues with Windows interfe
2. Once the process finishes, restart your machine.
### WSL1
3a. Open Windows Powershell **as Administrator** again (after restarting), and run the following command to configure Ubuntu to use WSL1.
3. Open Windows Powershell **as Administrator** again (after restarting), and run the following command to configure Ubuntu to use WSL1.
```powershell
wsl --set-version Ubuntu 1
```
### WSL2
3a. Open Windows Powershell **as Administrator** again (after restarting), and run the following command to configure Ubuntu to use WSL2.
3. Open Windows Powershell **as Administrator** again (after restarting), and run the following command to configure Ubuntu to use WSL2.
```powershell
wsl --set-version Ubuntu 2

12
src/battle_util.c
View file

@ -285,7 +285,7 @@ void HandleAction_UseMove(void)
gBattlerTarget = battler;
}
}
else if (IsDoubleBattle() && moveTarget & MOVE_TARGET_RANDOM)
else if (IsDoubleBattle() && moveTarget & MOVE_TARGET_RANDOM)
{
gBattlerTarget = SetRandomTarget(gBattlerAttacker);
if (gAbsentBattlerFlags & (1u << gBattlerTarget)
@ -301,7 +301,7 @@ void HandleAction_UseMove(void)
else
gBattlerTarget = gBattlerAttacker;
}
else if (IsDoubleBattle() && moveTarget == MOVE_TARGET_FOES_AND_ALLY)
else if (IsDoubleBattle() && moveTarget == MOVE_TARGET_FOES_AND_ALLY)
{
for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
{
@ -932,22 +932,22 @@ static void UNUSED MarkAllBattlersForControllerExec(void)
else
{
for (i = 0; i < gBattlersCount; i++)
gBattleControllerExecFlags |= 1 << i;
gBattleControllerExecFlags |= 1u << i;
}
}
bool32 IsBattlerMarkedForControllerExec(u32 battler)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
return (gBattleControllerExecFlags & (1 << (battler + 28))) != 0;
return (gBattleControllerExecFlags & (1u << (battler + 28))) != 0;
else
return (gBattleControllerExecFlags & (1 << battler)) != 0;
return (gBattleControllerExecFlags & (1u << battler)) != 0;
}
void MarkBattlerForControllerExec(u32 battler)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
gBattleControllerExecFlags |= 1u << (32 - MAX_BATTLERS_COUNT);
gBattleControllerExecFlags |= 1u << (battler + 32 - MAX_BATTLERS_COUNT);
else
gBattleControllerExecFlags |= 1u << battler;
}

2
test/battle/ability/insomnia.c
View file

@ -26,7 +26,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents yawn")
PLAYER(SPECIES_DROWZEE) { Ability(ABILITY_INSOMNIA); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(opponent, MOVE_SPORE); }
TURN { MOVE(opponent, MOVE_YAWN); }
TURN {}
TURN {}
} SCENE {