Small fixes

src/bitmap.cpp

@@ -674,7 +674,7 @@ void Bitmap::TiledBlit(int ox, int oy, Rect const& src_rect, Bitmap const& src,
 		return;
 
 	if (ox >= src_rect.width)	ox %= src_rect.width;
-	if (oy >= src_rect.height)	ox %= src_rect.height;
+	if (oy >= src_rect.height)	oy %= src_rect.height;
 	if (ox < 0) ox += src_rect.width  * ((-ox + src_rect.width  - 1) / src_rect.width);
 	if (oy < 0) oy += src_rect.height * ((-oy + src_rect.height - 1) / src_rect.height);
 

src/game_battlealgorithm.cpp

@@ -1399,15 +1399,14 @@ bool Game_BattleAlgorithm::Escape::Execute() {
 		int ally_agi = Main_Data::game_party->GetAverageAgility();
 		int enemy_agi = Main_Data::game_enemyparty->GetAverageAgility();
 
-		double to_hit = 1.5 * ((float)ally_agi / enemy_agi);
+		// flee chance is 0% when ally has less than 70% of enemy agi
+		// 100% -> 50% flee, 200% -> 100% flee
+		float to_hit = std::max(0.0f, 1.5f - ((float)enemy_agi / ally_agi));
 
-		// Every failed escape is worth 10% higher escape chance (see help file)
-		for (int i = 0; i < Game_Battle::escape_fail_count; ++i) {
-			to_hit += (to_hit * 0.1);
-		}
+		// Every failed escape is worth 10% higher escape chance
+		to_hit += to_hit * Game_Battle::escape_fail_count * 0.1f;
 
 		to_hit *= 100;
-
 		this->success = Utils::GetRandomNumber(0, 99) < (int)to_hit;
 	}
 

src/game_map.cpp

@@ -356,7 +356,7 @@ void Game_Map::ScrollDown(int distance) {
 		map_info.position_y = (map_info.position_y + distance + height) % height;
 		parallax_y -= map_info.parallax_vert ? distance / 2 : 0;
 	} else {
-		if (map_info.position_y + distance < (GetHeight() - 15) * SCREEN_TILE_WIDTH) {
+		if (map_info.position_y + distance <= (GetHeight() - 15) * SCREEN_TILE_WIDTH) {
 			map_info.position_y += distance;
 			if (map_info.parallax_vert)
 				parallax_y -= distance / 2;
@@ -390,7 +390,7 @@ void Game_Map::ScrollRight(int distance) {
 		map_info.position_x = (map_info.position_x + distance + width) % width;
 		parallax_x -= map_info.parallax_horz ? distance / 2 : 0;
 	} else {
-		if (map_info.position_x + distance < (GetWidth() - 20) * SCREEN_TILE_WIDTH) {
+		if (map_info.position_x + distance <= (GetWidth() - 20) * SCREEN_TILE_WIDTH) {
 			map_info.position_x += distance;
 			if (map_info.parallax_horz)
 				parallax_x -= distance / 2;

src/scene_battle_rpg2k.cpp

@@ -641,6 +641,9 @@ void Scene_Battle_Rpg2k::Escape() {
 		escape_success = escape_alg.Execute();
 		escape_alg.Apply();
 
+		if (escape_success)
+			Game_System::SePlay(Game_System::GetSystemSE(Game_System::SFX_Escape));
+
 		battle_result_messages.clear();
 		escape_alg.GetResultMessages(battle_result_messages);
 

src/scene_battle_rpg2k3.cpp

@@ -943,6 +943,7 @@ void Scene_Battle_Rpg2k3::Escape() {
 		ShowNotification(battle_result_messages[0]);
 	}
 	else {
+		Game_System::SePlay(Game_System::GetSystemSE(Game_System::SFX_Escape));
 		Game_Temp::battle_result = Game_Temp::BattleEscape;
 
 		// ToDo: Run away animation