scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix octorok shooting direction, random 4way shot logic

Browse Source
This commit is contained in:
scawful
2024-08-18 20:16:55 -04:00
parent ae8bd1ae64
commit a90e73f06c
1 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Sprites/Enemies/octorok.asm
View File

@@ -78,35 +78,33 @@ Sprite_Octorok_Main:
Octorok_MoveDown: Octorok_MoveDown:
{ {
%PlayAnimation(0,1,10) %PlayAnimation(0,1,10)
RTS RTS
} }
Octorok_MoveUp: Octorok_MoveUp:
{ {
%StartOnFrame(2)
%PlayAnimation(2,3,10) %PlayAnimation(2,3,10)
RTS RTS
} }
Octorok_MoveLeft: Octorok_MoveLeft:
{ {
%StartOnFrame(4)
%PlayAnimation(4,5,10) %PlayAnimation(4,5,10)
RTS RTS
} }
Octorok_MoveRight: Octorok_MoveRight:
{ {
%StartOnFrame(6)
%PlayAnimation(6,7,10) %PlayAnimation(6,7,10)
RTS RTS
} }
} }
Sprite_Octorok_Move: Sprite_Octorok_Move:
{ {
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
JSL Sprite_Move JSL Sprite_Move
JSL Sprite_CheckDamageFromPlayer JSL Sprite_CheckDamageFromPlayer
@@ -171,26 +169,31 @@ Sprite_Octorok_Move:
.exit .exit
RTS RTS
.direction .direction
db 3, 2, 0, 1 db 3, 2, 0, 1
.speed_x .speed_x
db 24, -24, 0, 0 db 24, -24, 0, 0
.speed_y .speed_y
db 0, 0, 24, -24 db 0, 0, 24, -24
.unused .timer
db $01, $02, $04, $08
.timer
db 60, 128, 160, 128 db 60, 128, 160, 128
} }
Octorock_ShootEmUp: Octorock_ShootEmUp:
{ {
JSL GetRandomInt : AND.b #$01 : BEQ .single_shot ; Use SprMiscD as a flag to shoot 4 ways for awhile before going back to single shot
LDA.w SprMiscD, X : BEQ .continue
LDA.w SprTimerD, X : BNE .four_ways
LDA.b #$01 : STA.w SprMiscD, X
.continue
JSL GetRandomInt : AND.b #$1F : BNE .single_shot
.four_ways
LDA.b #$01 : STA.w SprMiscD, X
LDA.b #$20 : STA.w SprTimerD, X
JSR Octorok_Shoot4Ways JSR Octorok_Shoot4Ways
RTS RTS
.single_shot .single_shot
@@ -218,13 +221,12 @@ Octorok_ShootSingle:
RTS RTS
.mouth_anim_step .mouth_anim_step
db $00, $02, $02, $02 db $00, $02, $02, $02
db $01, $01, $01, $00 db $01, $01, $01, $00
db $00, $00, $00, $00 db $00, $00, $00, $00
db $02, $02, $02, $02 db $02, $02, $02, $02
db $02, $01, $01, $00 db $02, $01, $01, $00
} }
; --------------------------------------------------------- ; ---------------------------------------------------------
@@ -234,22 +236,16 @@ Octorok_Shoot4Ways:
LDA.w SprTimerA,X LDA.w SprTimerA,X
PHA PHA
CMP.b #$80 CMP.b #$80 : BCS .animate
BCS .animate
AND.b #$0F
BNE .delay_turn
AND.b #$0F : BNE .delay_turn
PHA PHA
LDY.w SprMiscC,X LDY.w SprMiscC,X
LDA.w .next_direction,Y : STA.w SprMiscC,X
LDA.w .next_direction,Y
STA.w SprMiscC,X
PLA PLA
.delay_turn
.delay_turn
CMP.b #$08 CMP.b #$08
BNE .animate BNE .animate
@@ -263,8 +259,7 @@ Octorok_Shoot4Ways:
LSR A LSR A
TAY TAY
LDA.w .mouth_anim_step,Y LDA.w .mouth_anim_step,Y : STA.w SprMiscB,X
STA.w SprMiscB,X
RTS RTS