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

Update MoveBody formatting

Browse Source
This commit is contained in:
scawful
2024-03-30 12:04:34 -04:00
parent 9d1cd684d7
commit 761fbce7d8
1 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Sprites/Bosses/kydreeok.asm
View File

@@ -300,87 +300,56 @@ SpawnRightHead:
RTS RTS
} }
; =========================================================
; Originally from Trinexx_MoveBody $1DB2E5
; ==============================================================================
MoveBody: MoveBody:
{ {
; Handle the shell bg movement ; Handle the shell bg movement
; Trinexx_MoveBody ; Trinexx_MoveBody
#_1DB2E5: LDA.w $0D10, X LDA.w $0D10, X : PHA
#_1DB2E8: PHA LDA.w $0D00, X : PHA
#_1DB2E9: LDA.w $0D00, X JSL Sprite_Move
#_1DB2EC: PHA
#_1DB2ED: JSL Sprite_Move PLA
LDY.b #$00 : SEC : SBC.w $0D00, X : STA.w $0310
#_1DB2F0: PLA BPL .pos_y_low
#_1DB2F1: LDY.b #$00 DEY
#_1DB2F3: SEC
#_1DB2F4: SBC.w $0D00, X
#_1DB2F7: STA.w $0310
#_1DB2FA: BPL .pos_y_low
#_1DB2FC: DEY
.pos_y_low .pos_y_low
#_1DB2FD: STY.w $0311 STY.w $0311
; ----------------------------------------------------- ; -----------------------------------------------------
#_1DB300: PLA PLA
#_1DB301: LDY.b #$00 LDY.b #$00 : SEC : SBC.w $0D10, X : STA.w $0312
BPL .pos_x_low
#_1DB303: SEC DEY
#_1DB304: SBC.w $0D10, X
#_1DB307: STA.w $0312
#_1DB30A: BPL .pos_x_low
#_1DB30C: DEY
.pos_x_low .pos_x_low
#_1DB30D: STY.w $0313 STY.w $0313
; ----------------------------------------------------- ; -----------------------------------------------------
#_1DB310: LDA.b #$01 LDA.b #$01 : STA.w $0428
#_1DB312: STA.w $0428
LDA.w $0D00, X : SEC : SBC.b #$0C : STA.w $0DB0, X
#_1DB318: LDA.w $0D00, X LDA.w $0B08 : SEC : SBC.w $0D10, X
#_1DB31B: SEC CLC : ADC.b #$02
#_1DB31C: SBC.b #$0C CMP.b #$04 : BCS .not_at_target
#_1DB31E: STA.w $0DB0, X
#_1DB321: LDA.w $0B08 LDA.w $0B09 : SEC : SBC.w $0D00, X
#_1DB324: SEC CLC : ADC.b #$02
#_1DB325: SBC.w $0D10, X CMP.b #$04 : BCS .not_at_target
#_1DB328: CLC
#_1DB329: ADC.b #$02
#_1DB32B: CMP.b #$04 .adjust_phase ; Unused?
#_1DB32D: BCS .not_at_target STZ.w $0D80, X
LDA.b #$30 : STA.w $0DF0, X
#_1DB32F: LDA.w $0B09
#_1DB332: SEC
#_1DB333: SBC.w $0D00, X
#_1DB336: CLC
#_1DB337: ADC.b #$02
#_1DB339: CMP.b #$04
#_1DB33B: BCS .not_at_target
.adjust_phase
#_1DB33D: STZ.w $0D80, X
#_1DB340: LDA.b #$30
#_1DB342: STA.w $0DF0, X
.not_at_target .not_at_target
; JSR AdjustChildrenPos
; LayerEffect_Trinexx $0AFEF0 ; LayerEffect_Trinexx $0AFEF0
REP #$20 REP #$20
LDA.w $0422 : CLC : ADC.w $0312 : STA.w $0422 LDA.w $0422 : CLC : ADC.w $0312 : STA.w $0422
@@ -388,11 +357,10 @@ MoveBody:
STZ.w $0312 : STZ.w $0310 STZ.w $0312 : STZ.w $0310
SEP #$20 SEP #$20
RTS RTS
} }
; ============================================================================== ; =========================================================
StopIfOutOfBounds: StopIfOutOfBounds:
{ {