Cleanup todos and add comments to overworld entrances and overlays

Overworld/entrances.asm

@@ -1,4 +1,8 @@
-;Map16Definitions = $0F8000
+; =========================================================
+; Custom Entrance Tile Types
+; Can use eithe vanilla map16 @ $0F8000
+; Or ZS Expanded @ $3D8000
+
 Map16Definitions = $3D8000
 Overworld_DrawMap16_Persist = $1BC97C
 Overworld_DrawMap16_Anywhere = $1BC983
@@ -13,7 +17,6 @@ org $1BBBF4
   RTL
 pullpc
 
-
 Overworld_UseEntranceEntry:
 {
   PHB : PHK : PLB

Overworld/overlays.asm

@@ -26,7 +26,7 @@ org $07866D
 ; 02 - Castle Bridge (OW 1B)
 ; 03 - Tail Palace (OW 2F)
 ; 04 - Goron Mines Entrance (OW 36)
-; 05 - TODO: Fortress of Secrets (OW 5E)
+; 05 - Fortress of Secrets (OW 5E)
 
 CameraCache = $0632
 
@@ -86,10 +86,6 @@ RTS
 
 pullpc
 
-; Zarby Notes
-; don't forget to set $C8 to zero (STZ.b $C8)
-; don't forget to set $B0 to zero (STZ.b $B0)
-
 ShakeScreen:
 {
   REP #$20
@@ -665,10 +661,9 @@ Castle_EntranceAnimation:
   dw Castle_Frame1
   dw Castle_Frame2
   dw Castle_RestoreCamera
-}
 
-Castle_EndAnimation:
+  Castle_EndAnimation:
-{
+  {
     INC.b $B0 ; increase frame
     STZ.b $C8 ; reset timer for next frame
     STZ.w $04C6
@@ -688,10 +683,10 @@ Castle_EndAnimation:
     ORA.b #$20
     STA.l $7EF280,X
     RTS
-}
+  }
 
-Castle_RestoreCamera:
+  Castle_RestoreCamera:
-{
+  {
     REP #$20
 
     INC.w $061A : INC.w $061A
@@ -705,10 +700,10 @@ Castle_RestoreCamera:
     +
     SEP #$20
     RTS
-}
+  }
 
-Castle_Frame0:
+  Castle_Frame0:
-{
+  {
     #_1BD017: LDA.b #$02 ; SFX3.07
     #_1BD019: STA.w $012F
     LDA.b $C8 : BEQ .doInit ; Load the timer
@@ -762,10 +757,10 @@ Castle_Frame0:
     STZ.b $C8 ; reset timer for next frame
     .wait
     RTS
-}
+  }
 
-Castle_Frame1:
+  Castle_Frame1:
-{
+  {
     LDA.b #$16 ; SFX3.16
     STA.w $012F
     LDA.b $C8 : BEQ .doInit ; Load the timer
@@ -843,10 +838,10 @@ Castle_Frame1:
     STZ.b $C8 ; reset timer for next frame
     .wait
     RTS
-}
+  }
 
-Castle_Frame2:
+  Castle_Frame2:
-{
+  {
     LDA.b $C8 : BEQ .doInit ; Load the timer
     JMP .notfirstframe
     .doInit
@@ -874,10 +869,10 @@ Castle_Frame2:
     STZ.b $C8 ; reset timer for next frame
     .wait
     RTS
-}
+  }
 
-Castle_Frame3:
+  Castle_Frame3:
-{
+  {
     LDA.b $C8 : BEQ .doInit ; Load the timer
     JMP .notfirstframe
     .doInit
@@ -917,6 +912,7 @@ Castle_Frame3:
     STZ.b $C8 ; reset timer for next frame
     .wait
     RTS
+  }
 }
 
 ; =========================================================
@@ -1014,6 +1010,8 @@ TailPalace_EntranceAnimation:
   }
 }
 
+; =========================================================
+
 Goron_EntranceAnimation:
 {
   LDA.b $B0 : ASL A : TAX ; x2
@@ -1145,7 +1143,7 @@ Goron_EntranceAnimation:
   RTS
 }
 
-
+; =========================================================
 
 Fortress_EntranceAnimation:
 {

oracle.org

@@ -239,6 +239,9 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village
   - [X] Eon Abyss Variant
 - [X] Animate mines opening animation
 
+** DONE Fortress of Secrets Cutscene
+Should use the Ganons Tower Crystal Cutscene as the base.
+
 ** ACTIVE Fix Minecart mechanics
 ** ACTIVE Collectible Item Quests [2/6]
 - [ ] Bananas
@@ -269,9 +272,6 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village
 - [ ] Improve fireball attack
 - [ ] Improve head/neck rotation
 
-** TODO Fortress of Secrets Cutscene
-Should use the Ganons Tower Crystal Cutscene as the base.
-
 ** TODO End Credits
 
 * Timeline