Prevent softlocking in door of temple remains cave (#151)

jangler · Nov 6, 2021 · f6d88bb · f6d88bb
1 parent be0485d
commit f6d88bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/asm/cutscenes.yaml b/asm/cutscenes.yaml
@@ -11,7 +11,10 @@ seasons:
       ld hl,6314
       call interactionSetScript
       ld a,15
-      jp setGlobalFlag
+      call setGlobalFlag
+      ld hl,c716
+      set 0,(hl) # affects tileSubTable
+      ret
 
   # drop link below bushes at game start, not above
   07/4197/: db 58

diff --git a/asm/layouts.yaml b/asm/layouts.yaml
@@ -86,6 +86,10 @@ seasons:
   # data for applyAllTileSubstitutions: group,room,flags,yx,tile
   04/tileSubTable: |
       db 00,01,01,52,04 # permanently remove flower outside D6 when cut
+      db 00,16,01,18,0f # add walkable tile outside temple remains door
+      db 00,16,01,17,64 # ^ and replace the rest of the tree with rocks
+      db 00,16,01,27,64 # ^
+      db 00,16,01,28,70 # ^
       db 00,25,00,32,3a # add ledge down from temple remains lower portal
       db 00,25,00,33,cf # ^
       db 00,25,00,34,4b # ^