Fix waves by making UL 45 slopes have no collision

tfdsoft · Feb 20, 2025 · 261f595 · 261f595
1 parent a81fa12
commit 261f595
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/SAUCE/functions/collision.h b/SAUCE/functions/collision.h
@@ -535,9 +535,13 @@ char bg_coll_slope() {
 	// 45 degrees
 
 	col_slope_LU45:
-		tmp7 = (temp_x & 0x0f);	// = 0x0F - (temp_x & 0x0F)
-		tmp4 = (temp_y & 0x0f) ^ 0x0f;
-
+		if (gamemode == GAMEMODE_WAVE) {
+			return 0;
+		}
+		else {
+			tmp7 = (temp_x & 0x0f);	// = 0x0F - (temp_x & 0x0F)
+			tmp4 = (temp_y & 0x0f) ^ 0x0f;
+		}
 		currplayer_slope_type = SLOPE_45DEG_DOWN_UD;
 		goto col_end;
 
@@ -885,7 +889,7 @@ char bg_coll_U() {
 	}
 
 	if (high_byte(currplayer_vel_y) & 0x80) {
-		temp_x = Generic.x + low_word(scroll_x) + (gamemode == GAMEMODE_WAVE ? 4 : 0); // automatically only the low byte
+		temp_x = Generic.x + low_word(scroll_x) + (gamemode == GAMEMODE_WAVE ? 10 : 0); // automatically only the low byte
 
 		storeWordSeparately(
 			add_scroll_y(