Merge remote-tracking branch 'vuryleo/patch-1' into develop

82dae43a · wind2009 · 7161db0a · 5d81ad2c · 82dae43a
Commit 82dae43a authored Jan 11, 2026 by wind2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

processor.cpp processor.cpp +3 -0

No files found.
--- a/processor.cpp
+++ b/processor.cpp
@@ -3919,6 +3919,9 @@ int32_t field::process_turn(uint16_t step, uint8_t turn_player) {
 			}
 			return FALSE;
 		}
+		// ensure "entered 2nd Battle Phase" marker stored in `arg2` do not carry over into Main Phase 2.
+		core.units.begin()->arg2 = 0;
+		
 		core.skip_m2 = FALSE;
 		if(returns.ivalue[0] == 3) { // End Phase
 			core.skip_m2 = TRUE;