add earcopter + freeze as learned items + fix collision after item pick up

1 files changed, 64 insertions, 1 deletions

diff --git a/map/objects.gbasm b/map/objects.gbasm
index c20146f..0c1ec51 100644
--- a/map/objects.gbasm
+++ b/map/objects.gbasm
@@ -174,6 +174,14 @@ Object_Interaction_Jump_table:
 	JP =Heal_Attack_Box_Action
 	NOP
 
+	; 05
+	JP =Freeze_Attack_Box_Action
+	NOP
+
+	; 06
+	JP =Earcopter_Attack_Box_Action
+	NOP
+
 Stairs_Action:
 	LD A, $enum_dungeon_generation_mode
 	LD $mem_current_mode, A
@@ -192,7 +200,7 @@ Stairs_Action:
 
 Heal_Action:
 	LD A, $mem_bunny_health
-	ADD $03
+	ADD $05
 	DAA
 	CP $20
 	JR C, =.Set_health
@@ -224,6 +232,15 @@ Heal_Attack_Box_Action:
 
 	LD A, $enum_dungeon_dialogue_mode
 	LD $mem_requested_mode, A
+	LD $mem_current_mode, A
+	LD A, $mem_bunny_direction
+	AND $07
+	LD $mem_bunny_direction, A
+	LD A, $mem_map_loading_flags
+	SET 5, A
+	LD $mem_map_loading_flags, A
+
+	CALL =Fix_Bunny_screen
 
 	RET
 
@@ -231,6 +248,52 @@ Heal_Attack_Box_Action:
 	.LEARN_ATTACK $02
 	.END
 
+Freeze_Attack_Box_Action:
+	LD (HL), $00
+
+	.START_SCRIPT =.Script
+
+	LD A, $enum_dungeon_dialogue_mode
+	LD $mem_requested_mode, A
+	LD $mem_current_mode, A
+	LD A, $mem_bunny_direction
+	AND $07
+	LD $mem_bunny_direction, A
+	LD A, $mem_map_loading_flags
+	SET 5, A
+	LD $mem_map_loading_flags, A
+
+	CALL =Fix_Bunny_screen
+
+	RET
+
+	.Script:
+	.LEARN_ATTACK $03
+	.END
+
+Earcopter_Attack_Box_Action:
+	LD (HL), $00
+
+	.START_SCRIPT =.Script
+
+	LD A, $enum_dungeon_dialogue_mode
+	LD $mem_requested_mode, A
+	LD $mem_current_mode, A
+	LD A, $mem_bunny_direction
+	AND $07
+	LD $mem_bunny_direction, A
+	LD A, $mem_map_loading_flags
+	SET 5, A
+	LD $mem_map_loading_flags, A
+
+	CALL =Fix_Bunny_screen
+
+	RET
+
+	.Script:
+	.LEARN_ATTACK $04
+	.END
+
 Restore_EP_Action:
 	LD A, $mem_bunny_mana
 	ADD $15