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

Update boss sprites and macros

Browse Source
This commit is contained in:
scawful
2025-01-09 02:46:06 -05:00
parent 87685843e7
commit 740a94d3bc
4 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Sprites/Bosses/kydreeok.asm
View File

@@ -247,7 +247,7 @@ Sprite_Kydreeok_Main:
SEP #$20
JSR StopIfOutOfBounds
;if both velocities are 0 go back to the Stalk_Player_XORY to re-set the course
; if both velocities are 0 go back to the Stalk_Player_XORY to re-set the course
LDA.w SprYSpeed, X : BNE .notZero
LDA.w SprXSpeed, X : BNE .notZero
%GotoAction(3) ; Kydreeok_MoveXorY
@@ -258,7 +258,7 @@ Sprite_Kydreeok_Main:
JSL Sprite_CheckDamageFromPlayer
JSL Sprite_CheckDamageToPlayer
PLX ;restores X
PLX
RTS
}
@@ -564,52 +564,52 @@ StopIfOutOfBounds:
ApplyPalette:
{
REP #$20 ;Set A in 16bit mode
REP #$20 ;Set A in 16bit mode
;note, this uses adresses like 7EC300 and not 7EC500 because the game
;will fade the colors into 7EC500 based on the colors found in 7EC300
;note, this uses adresses like 7EC300 and not 7EC500 because the game
;will fade the colors into 7EC500 based on the colors found in 7EC300
LDA #$7FFF : STA $7EC5E2 ;BG2
LDA #$319B : STA $7EC5E4
LDA #$15B6 : STA $7EC5E6
LDA #$369E : STA $7EC5E8
LDA #$14A5 : STA $7EC5EA
LDA #$7E56 : STA $7EC5EC
LDA #$65CA : STA $7EC5EE
; LDA #$14A5 : STA $7EC5F0
; LDA #$7E56 : STA $7EC5F2
; LDA #$65CA : STA $7EC5F4
LDA #$7FFF : STA $7EC5E2 ;BG2
LDA #$319B : STA $7EC5E4
LDA #$15B6 : STA $7EC5E6
LDA #$369E : STA $7EC5E8
LDA #$14A5 : STA $7EC5EA
LDA #$7E56 : STA $7EC5EC
LDA #$65CA : STA $7EC5EE
; LDA #$14A5 : STA $7EC5F0
; LDA #$7E56 : STA $7EC5F2
; LDA #$65CA : STA $7EC5F4
INC $15
INC $15
SEP #$20 ;Set A in 8bit mode
SEP #$20 ;Set A in 8bit mode
RTS
RTS
}
ApplyEndPalette:
{
REP #$20 ;Set A in 16bit mode
REP #$20 ;Set A in 16bit mode
;note, this uses adresses like 7EC300 and not 7EC500 because the game
;will fade the colors into 7EC500 based on the colors found in 7EC300
;note, this uses adresses like 7EC300 and not 7EC500 because the game
;will fade the colors into 7EC500 based on the colors found in 7EC300
LDA #$1084 : STA $7EC5E2 ;BG2
LDA #$210D : STA $7EC5E4
LDA #$3191 : STA $7EC5E6
LDA #$4E78 : STA $7EC5E8
LDA #$14A5 : STA $7EC5EA
LDA #$7E56 : STA $7EC5EC
LDA #$65CA : STA $7EC5EE
; LDA #$14A5 : STA $7EC5F0
; LDA #$7E56 : STA $7EC5F2
; LDA #$65CA : STA $7EC5F4
LDA #$1084 : STA $7EC5E2 ;BG2
LDA #$210D : STA $7EC5E4
LDA #$3191 : STA $7EC5E6
LDA #$4E78 : STA $7EC5E8
LDA #$14A5 : STA $7EC5EA
LDA #$7E56 : STA $7EC5EC
LDA #$65CA : STA $7EC5EE
; LDA #$14A5 : STA $7EC5F0
; LDA #$7E56 : STA $7EC5F2
; LDA #$65CA : STA $7EC5F4
INC $15
INC $15
SEP #$20 ;Set A in 8bit mode
SEP #$20 ;Set A in 8bit mode
RTS
RTS
}
; =========================================================

13
Sprites/Bosses/octoboss.asm
View File

@@ -211,7 +211,7 @@ Sprite_Octoboss_Secondary:
; and use the macro GetTilePos($x,$y)
PHX
%mode16()
%m16()
%GetTilePos($0F, $07)
LDA.w #$068F : JSL Overworld_DrawMap16_Persist
@@ -231,7 +231,7 @@ Sprite_Octoboss_Secondary:
%GetTilePos($11, $08)
LDA.w #$06A4 : JSL Overworld_DrawMap16_Persist
%mode8()
%m8()
PLX
LDA.b #$01 : STA.b $14
+
@@ -432,27 +432,22 @@ Sprite_Octoboss_Secondary:
LDA.w SprTimerC, X : CMP.b #$40 : BNE +
PHX
%mode16()
%m16()
%GetTilePos($0F, $07)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%GetTilePos($10, $07)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%GetTilePos($11, $07)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%GetTilePos($0F, $08)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%GetTilePos($10, $08)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%GetTilePos($11, $08)
LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
%mode8()
%m8()
PLX
LDA.b #$01 : STA.b $14
+