Correct battle logic errors

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>

SeasonsOfLoneliness.cpp

@@ -1456,7 +1456,7 @@ public:
 						int TARGET_COORDS_X=CURRENT_ENCOUNTER.x+WIDTH/32/2;
 						int TARGET_COORDS_Y=CURRENT_ENCOUNTER.y+HEIGHT/32/2;
 						if (PLAYER_COORDS[0]==TARGET_COORDS_X&&PLAYER_COORDS[1]==TARGET_COORDS_Y
-							&&BATTLE_PLAYER_COORDS.x==CURRENT_ENCOUNTER.playerX&&BATTLE_PLAYER_COORDS.y==CURRENT_ENCOUNTER.playerY) {
+							&&BATTLE_PLAYER_COORDS.x==CURRENT_ENCOUNTER.x+CURRENT_ENCOUNTER.playerX&&BATTLE_PLAYER_COORDS.y==CURRENT_ENCOUNTER.y+CURRENT_ENCOUNTER.playerY) {
 							BATTLE_STATE = battle::PLAYER_SELECTION;
 							clearPixelEffect();
 							EFFECT_TIMER = 0;
@@ -1631,6 +1631,8 @@ public:
 						}
 					}
 					if (EFFECT_TIMER==120) {
+						EFFECT_TIMER=0;
+						clearPixelEffect();
 						BATTLE_REASON_CODE=-1;
 						BATTLE_STATE=battle::DAMAGE_RESOLUTION;
 					}
@@ -1653,6 +1655,10 @@ public:
 								BATTLE_CARD_SELECTION_IND=0;
 								PLAYER_SELECTED_TARGET=-1;
 								BATTLE_STATE=battle::NONE;
+								PLAYER_COORDS[0]=BATTLE_PLAYER_COORDS.x;
+								PLAYER_COORDS[1]=BATTLE_PLAYER_COORDS.y;	
+								clearSeeds();
+								clearTrees();
 								performCropUpdate(8);
 								if (FOOD_REGEN_TURNS>0) {
 									FOOD_REGEN_TURNS=0;
@@ -1675,13 +1681,9 @@ public:
 									break;
 								}
 							}
-							PLAYER_COORDS[0]=CURRENT_ENCOUNTER.x+BATTLE_PLAYER_COORDS.x;
-							PLAYER_COORDS[1]=CURRENT_ENCOUNTER.y+BATTLE_PLAYER_COORDS.y;
 							BATTLE_STATE=battle::WAIT_TURN_ANIMATION;
 							PIXEL_EFFECT_TRANSPARENCY=0;
 							EFFECT_TIMER=0;
-							clearSeeds();
-							clearTrees();
 						}
 					}
 				}break;