Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-01 22:38:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes octolock not ending after user switched out (#7556)

Browse Source 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
Alex
2025-08-25 15:46:36 +02:00
committed by GitHub
parent 0a3c281cdd
commit 6df3a48ca2
8 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@@ -133,7 +133,7 @@ struct DisableStruct
u8 neutralizingGas:1;
u8 iceFaceActivationPrevention:1; // fixes hit escape move edge case
u8 unnerveActivated:1; // Unnerve and As One (Unnerve part) activate only once per switch in
u8 padding:3;
u8 octolockedBy:3;
};
// Fully Cleared each turn after end turn effects are done. A few things are cleared before end turn effects