ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-10 15:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix After You for gen8 (#2646)

Browse Source 
Fix After You
This commit is contained in:
DizzyEggg 2023-02-16 21:59:36 +01:00 committed by GitHub
parent 6b08120d5f
commit d637ee3b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle.h
View File

@ -191,6 +191,7 @@ struct SpecialStatus
u8 weatherAbilityDone:1; u8 weatherAbilityDone:1;
u8 terrainAbilityDone:1; u8 terrainAbilityDone:1;
u8 emergencyExited:1; u8 emergencyExited:1;
u8 afterYou:1;
}; };
struct SideTimer struct SideTimer

3
src/battle_script_commands.c
View File

@ -9394,7 +9394,7 @@ static void Cmd_various(void)
break; break;
case VARIOUS_AFTER_YOU: case VARIOUS_AFTER_YOU:
if (GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget) if (GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget)
|| GetBattlerTurnOrderNum(gBattlerAttacker) == GetBattlerTurnOrderNum(gBattlerTarget) + 1) || GetBattlerTurnOrderNum(gBattlerAttacker) + 1 == GetBattlerTurnOrderNum(gBattlerTarget))
{ {
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
} }
@ -9419,6 +9419,7 @@ static void Cmd_various(void)
gBattlerByTurnOrder[2] = gBattlerTarget; gBattlerByTurnOrder[2] = gBattlerTarget;
gBattlerByTurnOrder[3] = data[2]; gBattlerByTurnOrder[3] = data[2];
} }
gSpecialStatuses[gBattlerTarget].afterYou = 1;
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
} }
return; return;

8
src/battle_util.c
View File

@ -909,9 +909,8 @@ void HandleAction_NothingIsFainted(void)
void HandleAction_ActionFinished(void) void HandleAction_ActionFinished(void)
{ {
#if B_RECALC_TURN_AFTER_ACTIONS >= GEN_8 #if B_RECALC_TURN_AFTER_ACTIONS >= GEN_8
u8 i, j; u32 i, j;
u8 battler1 = 0; bool32 afterYouActive = gSpecialStatuses[gBattlerByTurnOrder[gCurrentTurnActionNumber + 1]].afterYou;
u8 battler2 = 0;
#endif #endif
*(gBattleStruct->monToSwitchIntoId + gBattlerByTurnOrder[gCurrentTurnActionNumber]) = PARTY_SIZE; *(gBattleStruct->monToSwitchIntoId + gBattlerByTurnOrder[gCurrentTurnActionNumber]) = PARTY_SIZE;
gCurrentTurnActionNumber++; gCurrentTurnActionNumber++;
@ -938,6 +937,8 @@ void HandleAction_ActionFinished(void)
gBattleResources->battleScriptsStack->size = 0; gBattleResources->battleScriptsStack->size = 0;
#if B_RECALC_TURN_AFTER_ACTIONS >= GEN_8 #if B_RECALC_TURN_AFTER_ACTIONS >= GEN_8
if (!afterYouActive)
{
// i starts at `gCurrentTurnActionNumber` because we don't want to recalculate turn order for mon that have already // i starts at `gCurrentTurnActionNumber` because we don't want to recalculate turn order for mon that have already
// taken action. It's been previously increased, which we want in order to not recalculate the turn of the mon that just finished its action // taken action. It's been previously increased, which we want in order to not recalculate the turn of the mon that just finished its action
for (i = gCurrentTurnActionNumber; i < gBattlersCount - 1; i++) for (i = gCurrentTurnActionNumber; i < gBattlersCount - 1; i++)
@ -964,6 +965,7 @@ void HandleAction_ActionFinished(void)
} }
} }
} }
}
#endif #endif
} }

1
test/move_effect_after_you.c
View File

@ -8,7 +8,6 @@ ASSUMPTIONS
DOUBLE_BATTLE_TEST("After You makes the target move after user") DOUBLE_BATTLE_TEST("After You makes the target move after user")
{ {
if (B_RECALC_TURN_AFTER_ACTIONS >= GEN_8) KNOWN_FAILING; // #2615.
GIVEN { GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Speed(4); } PLAYER(SPECIES_WOBBUFFET) { Speed(4); }
PLAYER(SPECIES_WYNAUT) { Speed(1); } PLAYER(SPECIES_WYNAUT) { Speed(1); }