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

lower helmet chuchu health, housekeeping

Browse Source
This commit is contained in:
scawful
2025-01-19 12:59:02 -05:00
parent 206993e3d5
commit d95162d8ef
11 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sprites/Enemies/anti_kirby.asm
View File

@@ -81,7 +81,7 @@ Sprite_AntiKirby_Main:
JSL Sprite_CheckIfRecoiling JSL Sprite_CheckIfRecoiling
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw AntiKirby_Main dw AntiKirby_Main
dw AntiKirby_Hurt dw AntiKirby_Hurt

4
Sprites/Enemies/booki.asm
View File

@@ -60,7 +60,7 @@ Sprite_Booki_Prep:
Sprite_Booki_Main: Sprite_Booki_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw StalkPlayer dw StalkPlayer
dw HideFromPlayer dw HideFromPlayer
@@ -122,7 +122,7 @@ Sprite_Booki_Move:
.no_damage .no_damage
LDA.w SprMiscB, X LDA.w SprMiscB, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw SlowFloat dw SlowFloat
dw FloatAway dw FloatAway

14
Sprites/Enemies/business_scrub.asm
View File

@@ -60,14 +60,10 @@ Sprite_BusinessScrub_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.w SprSubtype, X : CMP.b #$01 : BEQ .pea_shot LDA.w SprSubtype, X : CMP.b #$01 : BEQ .pea_shot
CMP.b #$02 : BEQ .cutscene_scrub
JMP + JMP +
.pea_shot .pea_shot
LDA.b #$06 : STA.w SprAction, X ; Pea Shot State LDA.b #$06 : STA.w SprAction, X ; Pea Shot State
LDA.b #$20 : STA.b SprPrize, X LDA.b #$20 : STA.b SprPrize, X
JMP +
.cutscene_scrub
LDA.b #$08 : STA.w SprAction, X
+ +
PLB PLB
RTL RTL
@@ -84,7 +80,7 @@ Sprite_BusinessScrub_Prep:
Sprite_BusinessScrub_Main: Sprite_BusinessScrub_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw BusinessScrub_Hiding dw BusinessScrub_Hiding
dw BusinessScrub_Attack dw BusinessScrub_Attack
@@ -96,8 +92,6 @@ Sprite_BusinessScrub_Main:
dw BusinessScrub_PeaShot dw BusinessScrub_PeaShot
dw BusinessScrub_HidingDefeated dw BusinessScrub_HidingDefeated
dw BusinessScrub_CutsceneStart
; 0x00 ; 0x00
BusinessScrub_Hiding: BusinessScrub_Hiding:
{ {
@@ -239,12 +233,6 @@ Sprite_BusinessScrub_Main:
RTS RTS
} }
BusinessScrub_CutsceneStart:
{
; TODO: Add deku dream cutscene
RTS
}
} }
; ========================================================= ; =========================================================

2
Sprites/Enemies/eon_scrub.asm
View File

@@ -12,7 +12,7 @@
Sprite_EonScrub_Main: Sprite_EonScrub_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw EonScrub_Stalking dw EonScrub_Stalking
dw EonScrub_Attack dw EonScrub_Attack

4
Sprites/Enemies/goriya.asm
View File

@@ -60,7 +60,7 @@ Sprite_Goriya_Prep:
Sprite_Goriya_Main: Sprite_Goriya_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Goriya_WalkingUp dw Goriya_WalkingUp
dw Goriya_WalkingDown dw Goriya_WalkingDown
@@ -191,7 +191,7 @@ Sprite_Goriya_Move:
+ +
LDA.w SprMiscB, X LDA.w SprMiscB, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Goriya_MoveUp dw Goriya_MoveUp
dw Goriya_MoveDown dw Goriya_MoveDown

4
Sprites/Enemies/helmet_chuchu.asm
View File

@@ -66,7 +66,7 @@ Sprite_HelmetChuchu_Prep:
RTL RTL
.health .health
db $08, $0C, $40, $C0 db $08, $0C, $0F, $10
} }
; ========================================================= ; =========================================================
@@ -222,7 +222,7 @@ Sprite_Chuchu_Move:
JSL Sprite_CheckIfRecoiling JSL Sprite_CheckIfRecoiling
LDA.w SprMiscB, X LDA.w SprMiscB, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw BounceTowardPlayer dw BounceTowardPlayer
dw RecoilFromPlayer dw RecoilFromPlayer

2
Sprites/Enemies/leever.asm
View File

@@ -47,7 +47,7 @@ Sprite_Leever_Main:
{ {
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Leever_Underground dw Leever_Underground
dw Leever_Emerge dw Leever_Emerge

6
Sprites/Enemies/octorok.asm
View File

@@ -74,7 +74,7 @@ Sprite_Octorok_Main:
.not_water_tile .not_water_tile
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Octorok_MoveDown dw Octorok_MoveDown
dw Octorok_MoveUp dw Octorok_MoveUp
@@ -206,7 +206,7 @@ Sprite_WaterOctorok_Main:
JSR Sprite_WaterOctorok_Attack JSR Sprite_WaterOctorok_Attack
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw WaterOctorok_FaceDown dw WaterOctorok_FaceDown
dw WaterOctorok_FaceUp dw WaterOctorok_FaceUp
@@ -255,7 +255,7 @@ Sprite_WaterOctorok_Attack:
JSL Sprite_CheckDamageToPlayer JSL Sprite_CheckDamageToPlayer
LDA.w SprMiscG, X LDA.w SprMiscG, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw WaterOctorok_Hidden dw WaterOctorok_Hidden
dw WaterOctorok_PoppingUp dw WaterOctorok_PoppingUp

2
Sprites/Enemies/poltergeist.asm
View File

@@ -136,7 +136,7 @@ Sprite_Poltergeist_Prep:
Sprite_Poltergeist_Main: Sprite_Poltergeist_Main:
{ {
LDA.w SprAction, X : JSL UseImplicitRegIndexedLocalJumpTable LDA.w SprAction, X : JSL JumpTableLocal
dw PictureFrame dw PictureFrame
dw Chair dw Chair

2
Sprites/Enemies/sea_urchin.asm
View File

@@ -60,7 +60,7 @@ Sprite_SeaUrchin_Prep:
Sprite_SeaUrchin_Main: Sprite_SeaUrchin_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Idle dw Idle
dw Death dw Death

2
Sprites/Enemies/thunder_ghost.asm
View File

@@ -146,7 +146,7 @@ Sprite_ThunderGhost_Move:
.Continue .Continue
LDA.w SprMiscB, X LDA.w SprMiscB, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw ThunderGhostMove dw ThunderGhostMove