aboutsummaryrefslogtreecommitdiff
path: root/entity/actions.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'entity/actions.gbasm')
-rw-r--r--entity/actions.gbasm12
1 files changed, 11 insertions, 1 deletions
diff --git a/entity/actions.gbasm b/entity/actions.gbasm
index 57b9e78..083aed3 100644
--- a/entity/actions.gbasm
+++ b/entity/actions.gbasm
@@ -1,7 +1,13 @@
Entities_Actions:
LD A, $mem_moving_animation_step
CP $09
- JR NZ, =.Action_Functions
+ JR Z, =.Reset_Entities_Collision_Map
+ LD A, $mem_map_loading_flags
+ BIT 5, A
+
+ JR Z, =.Action_Functions
+
+ .Reset_Entities_Collision_Map:
CALL =Reset_Entities_Collision_Map
.Action_Functions:
@@ -81,6 +87,10 @@ Turn_Jump_table:
JP =QuestGoal_Turn
NOP
+ ; 06
+ JP =Fimsh_Turn
+ NOP
+
Interaction_Jump_table:
; 00
RET