Update Farore Sprite and Sprite Library

Sprites/farore.asm

@@ -8,12 +8,12 @@ incsrc sprite_functions_hooks.asm
 
 ;==============================================================================
 
-org $298000
+org $288000
 incsrc sprite_new_table.asm
 
 ;==============================================================================
 
-org $308000
+org $298000
 incsrc sprite_new_functions.asm
 
 ;==============================================================================
@@ -106,7 +106,6 @@ Sprite_Farore_Main:
   dw FaroreFollowPlayer
   dw MakuArea_FaroreFollowPlayer
   dw MakuArea_FaroreWaitForKydrog
-  ; dw MakuArea_FaroreWalkToPosition
 
 
   ; 00
@@ -248,14 +247,6 @@ Sprite_Farore_Main:
     RTS
   }
 
-
-  ; ; 09
-  ; MakuArea_FaroreWalkToPosition:
-  ; {
-  ;   %PlayAnimation(3, 4, 8)
-  ;   RTS 
-  ; }
-
 }
 ;==============================================================================
 

Sprites/sprite_macros.asm

@@ -59,6 +59,12 @@ macro PlayAnimation(frame_start, frame_end, frame_wait)
     +
 endmacro
 
+macro StartOnFrame(frame)
+    LDA.w SprFrame, x : CMP.b #<frame> : BCS +
+    LDA.b #<frame> : STA.w SprFrame, x
+    +
+endmacro
+
 
 ; Show message if the player is facing toward sprite and pressing A
 ; Return Carry Set if message is displayed
@@ -195,4 +201,8 @@ endmacro
 ; Will set the timer F to wait (length) amount of frames
 macro SetTimerF(length)
 LDA.b #<length> : STA.w SprTimerF, X
+endmacro
+
+macro NextAction()
+INC $0D80, X 
 endmacro

Sprites/sprite_new_functions.asm

@@ -102,7 +102,7 @@ Sprite_MoveAltitude:
 ; Movement, Collision are handled by this function (height:20 = vitreous)
 ; $09 = speed, $08 = max height
 ;===================================================================================================
-Sprite_Bouncetowardplayer:
+Sprite_BounceTowardPlayer:
 	JSL Sprite_MoveAltitude
 
 	DEC.w $0F80,X : DEC.w $0F80,X
@@ -113,7 +113,8 @@ Sprite_Bouncetowardplayer:
 
 	LDA.b $08 : STA.w $0F80,X ; set height from 08
 
-	LDA.b $09
+	;LDA.b $09
+  LDA.b #$20
 
 	JSL Sprite_ApplySpeedTowardsPlayer
 
@@ -136,4 +137,95 @@ Sprite_BounceFromTileCollision:
 	LDA.w $0D40,X : EOR.b #$FF : INC : STA.w $0D40,X
 	INC.w $0ED0,X
 
-++	RTL
+++	RTL
+
+; ==============================================================================
+
+MovieEffectTimer = $7EF500 ;0x01
+
+;these need to be the same as the next set
+;used to do the HDMA
+MovieEffectArray = $F900 ;0x0F
+MovieEffectBank = $7E
+
+;used to set the actual values
+MovieEffect0 = $7EF900 ;0x01
+MovieEffect1 = $7EF901 ;0x01
+MovieEffect2 = $7EF902 ;0x01
+MovieEffect3 = $7EF903 ;0x01
+MovieEffect4 = $7EF904 ;0x01
+MovieEffect5 = $7EF905 ;0x01
+MovieEffect6 = $7EF906 ;0x01
+MovieEffect7 = $7EF907 ;0x01
+MovieEffect8 = $7EF908 ;0x01
+MovieEffect9 = $7EF909 ;0x01
+MovieEffectA = $7EF90A ;0x01
+MovieEffectB = $7EF90B ;0x01
+MovieEffectC = $7EF90C ;0x01
+MovieEffectD = $7EF90D ;0x01
+MovieEffectE = $7EF90E ;0x01
+
+SetupMovieEffect:
+{
+    ;setup HDMA RAM
+    ;Top Dark Row
+    LDA.b #$01 : STA.l MovieEffect0
+    LDA.b #$00 : STA.l MovieEffect1
+
+    ;Top Dark Row Buffer
+    LDA.b #$1F : STA.l MovieEffect2
+    LDA.b #$0F : STA.l MovieEffect3
+
+    ;Middle Unaffected Area
+    LDA.b #$50 : STA.l MovieEffect4
+    LDA.b #$0F : STA.l MovieEffect5
+    LDA.b #$50 : STA.l MovieEffect6
+    LDA.b #$0F : STA.l MovieEffect7
+
+    ;Bottom Drak Row Buffer
+    LDA.b #$1F : STA.l MovieEffect8
+    LDA.b #$0F : STA.l MovieEffect9
+
+    ;Bottom Dark Row
+    LDA.b #$01 : STA.l MovieEffectA
+    LDA.b #$00 : STA.l MovieEffectB
+
+    ;Below screen 
+    LDA.b #$20 : STA.l MovieEffectC
+    LDA.b #$0F : STA.l MovieEffectD
+
+    ;End
+    LDA.b #$00 : STA.l MovieEffectE
+
+    ;start timer
+    LDA.b #$01 : STA.l MovieEffectTimer
+
+    RTS
+}
+
+; ; ==============================================================================
+
+MovieEffect:
+{
+    REP #$20
+    LDX #$00 : STX $4350 ;Set the transfer mode into 1 byte to 1 register
+    LDX #$00 : STX $4351 ;Set register to 00 ($21 00)
+
+    LDA.w #MovieEffectArray : STA $4352 ;set address of the hdma table
+    LDX.b #MovieEffectBank : STX $4354 ;set the bank of HDMA table
+
+    SEP #$20
+    LDA.b #$20 : STA $9B ;Do the HDMA instead of $420C
+
+    ; LDA $9B : ORA #$20 : STA $9B 
+    ; LDA.b #$02 : STA $13 ;controls the brightness of the screen
+
+    RTS
+
+    HDMATable: ;values cannot go above 80 or it will read as continuous mode
+    db $20, $00 ;for $20 line set screen brightness to 0
+    db $50, $0F ;for $A0 line set screen brightness to 15 full
+    db $50, $0F ;for $A0 line set screen brightness to 15 full
+    db $3F, $00 ;for $20 line set screen brightness to 0
+    db $00 ;end the HDMA
+}