Housekeeping

Core/music_macros.asm

@@ -353,13 +353,13 @@ Rest = $C9
 ; =========================================================
 ; Tone Map
 ;
-; 	    C 	C+ 	D 	D+ 	E 	F 	F+ 	G 	G+ 	A 	A+ 	B
-; Oc1 	80 	81 	82 	83 	84 	85 	86 	87 	88 	89 	8A 	8B
-; Oc2 	8C 	8D 	8E 	8F 	90 	91 	92 	93 	94 	95 	96 	97
-; Oc3 	98 	99 	9A 	9B 	9C 	9D 	9E 	9F 	A0 	A1 	A2 	A3
-; Oc4 	A4 	A5 	A6 	A7 	A8 	A9 	AA 	AB 	AC 	AD 	AE 	AF
-; Oc5 	B0 	B1 	B2 	B3 	B4 	B5 	B6 	B7 	B8 	B9 	BA 	BB
-; Oc6 	BC 	BD 	BE 	BF 	C0 	C1 	C2 	C3 	C4 	C5 	C6 	C7
+;       C   C+  D   D+  E   F   F+  G   G+  A   A+  B
+; Oc1   80  81  82  83  84  85  86  87  88  89  8A  8B
+; Oc2   8C  8D  8E  8F  90  91  92  93  94  95  96  97
+; Oc3   98  99  9A  9B  9C  9D  9E  9F  A0  A1  A2  A3
+; Oc4   A4  A5  A6  A7  A8  A9  AA  AB  AC  AD  AE  AF
+; Oc5   B0  B1  B2  B3  B4  B5  B6  B7  B8  B9  BA  BB
+; Oc6   BC  BD  BE  BF  C0  C1  C2  C3  C4  C5  C6  C7
 
 C1   = $80
 C1s  = $81

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,22 +87,19 @@ 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(1)
+      RTS
+    .maku_area
     %GotoAction(6)
     RTS
 
-  .waiting
+    .waiting
     %GotoAction(7)
     RTS
   }
@@ -116,12 +110,10 @@ 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
-    CMP.b #$9C ; Y = 6C
-    BCC .linkistoofar
-    %GotoAction(2)
-
-  .linkistoofar
+    ; Link's Y Position - Y = 6C
+    LDA.b $20 : CMP.b #$9C : BCC .linkistoofar
+      %GotoAction(2)
+    .linkistoofar
     %PlayAnimation(6, 6, 8) ; Farore look towards Link
     RTS
   }
@@ -133,17 +125,14 @@ 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 
-    CMP.b #$1A
-    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
+    ; Link's X position
+    LDA.b $22 : CMP.b #$1A : 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
-  #_1EEEE6: STA.b $11
+  LDA.b #$2E : STA.b $11
   RTL
 }
 
@@ -90,8 +89,7 @@ Graphics_Transfer:
     JSR ApplyManhandlaGraphics
     JSR ApplyManhandlaPalette
   +
-  #_02BE5E: LDA.b $11
-  #_02BE60: CMP.b #$02
+  LDA.b $11 : CMP.b #$02
   RTL
 }