From 41b5858e855c68e01bf388e54abd82661e846585 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Thu, 7 Aug 2025 16:53:50 +0200
Subject: Add heal sound effect + remove useless tile loads

---
 map/loading/dungeontiles.gbasm | 7 ++++++-
 map/objects.gbasm              | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'map')

diff --git a/map/loading/dungeontiles.gbasm b/map/loading/dungeontiles.gbasm
index ad02ff1..ea33593 100644
--- a/map/loading/dungeontiles.gbasm
+++ b/map/loading/dungeontiles.gbasm
@@ -24,6 +24,9 @@ Load_Prepared_Map:
 			CP E
 			JR NZ, =.For_X
 
+		LD A, $mem_viewport_x
+		SUB $02
+		LD C, A
 		INC B
 		LD A, B
 		CP D
@@ -107,6 +110,9 @@ Prepare_Scrolling_Map:
 	LD A, $mem_map_loading_flags
 	BIT 0, A
 	JR Z, =Display_Scrolling_Map.End
+	RES 0, A
+	LD $mem_map_loading_flags, A
+
 
 	LD A, $mem_moving_animation_step
 	LD C, A
@@ -328,7 +334,6 @@ Display_Prepared_Blocks:
 	LD ($mem_prepared_block_position), A
 	LD A, ($mem_additional_loading_block_position+1)
 	LD ($mem_prepared_block_position+1), A
-	JP =Display_Main_Prepared_Block
 
 Display_Main_Prepared_Block:
 	PUSH AF
diff --git a/map/objects.gbasm b/map/objects.gbasm
index e7dd028..4fdc195 100644
--- a/map/objects.gbasm
+++ b/map/objects.gbasm
@@ -247,6 +247,8 @@ Heal_Action:
 	POP DE
 	POP BC
 
+	.SET_SOUND_EFFECT =_sound_effect_Heal
+
 	LD (HL), $00
 
 	RET
@@ -364,6 +366,8 @@ Restore_EP_Action:
 	POP DE
 	POP BC
 
+	.SET_SOUND_EFFECT =_sound_effect_Heal
+
 	LD (HL), $00
 
 	RET
@@ -387,6 +391,7 @@ Display_Object:
 	CP $FF
 	RET Z
 	LD C, A
+
 	CP $00
 	JR NZ, =.skip_remove_object_after_display
 	LD (HL), $FF
-- 
cgit v1.2.3-70-g09d2