Housekeeping

Core/tables.asm

@@ -309,4 +309,3 @@ db $1A, $0A, $00, $00 ; 0x25 Dragon Ship
 db $00, $00, $03, $02 ; 0x26
 db $0E, $00, $03, $07 ; 0x27
 db $1A, $05, $05, $0B ; 0x28 Dragon Ship
-

Sprites/NPCs/farore.asm

@@ -58,11 +58,9 @@ Sprite_Farore_Prep:
   PHB : PHK : PLB
 
   LDA.b #$80 : STA $0CAA, X ; Don't kill Farore when she goes off screen
-
+  LDA.l $7EF300 : BEQ .PlayIntro
-  LDA.l $7EF300
-  BEQ .PlayIntro
     STZ.w $0DD0, X ; Kill the sprite
-.PlayIntro
+  .PlayIntro
 
   PLB
   RTL
@@ -75,7 +73,6 @@ Sprite_Farore_Prep:
 WALKSPEED = 14
 STORY_STATE = $B6
 
-
 Sprite_Farore_Main:
 {
   LDA.w SprAction, X; Load the SprAction
@@ -90,17 +87,14 @@ Sprite_Farore_Main:
   dw MakuArea_FaroreFollowPlayer
   dw MakuArea_FaroreWaitForKydrog
 
-
   ; 00
   IntroStart:
   {
     LDA #$01 : STA InCutScene
     LDA $B6 : CMP.b #$01 : BEQ .maku_area
               CMP.b #$02 : BEQ .waiting
-    
       %GotoAction(1)
       RTS
-
     .maku_area
     %GotoAction(6)
     RTS
@@ -116,11 +110,9 @@ Sprite_Farore_Main:
     LDA.w WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
     LDA.b #$08 : STA.b $49 ; Auto-movement north
 
-    LDA.b $20 ; Link's Y Position
+    ; Link's Y Position - Y = 6C
-    CMP.b #$9C ; Y = 6C
+    LDA.b $20 : CMP.b #$9C : BCC .linkistoofar
-    BCC .linkistoofar
       %GotoAction(2)
-
     .linkistoofar
     %PlayAnimation(6, 6, 8) ; Farore look towards Link
     RTS
@@ -133,16 +125,13 @@ Sprite_Farore_Main:
     LDA.w WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
     LDA.b #$02 : STA.b $49
 
-    LDA.b $22 ; Link's X position 
+    ; Link's X position
-    CMP.b #$1A
+    LDA.b $22 : CMP.b #$1A : BCS .linkistoofar
-    BCS .linkistoofar
-
       STZ.b $49 ; kill automove
       LDA.b #$20
       STA.w SprTimerA, X ; set timer A to 0x10
       %PlayAnimation(0, 0, 8)
       %GotoAction(3)
-
     .linkistoofar
     RTS
   }

Sprites/all_sprites.asm

@@ -71,8 +71,7 @@ DontTeleportWithoutFlippers:
   LDA.l $7EF356 : BNE +
     RTL
   +
-  #_1EEEE4: LDA.b #$2E
+  LDA.b #$2E : STA.b $11
-  #_1EEEE6: STA.b $11
   RTL
 }
 
@@ -90,8 +89,7 @@ Graphics_Transfer:
     JSR ApplyManhandlaGraphics
     JSR ApplyManhandlaPalette
   +
-  #_02BE5E: LDA.b $11
+  LDA.b $11 : CMP.b #$02
-  #_02BE60: CMP.b #$02
   RTL
 }