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

housekeeping

Browse Source
This commit is contained in:
scawful
2024-03-09 08:38:45 -05:00
parent df07fd4f65
commit a625d67cb8
6 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dungeons/dungeons.asm
View File

@@ -14,10 +14,7 @@ incsrc "Dungeons/Objects/object_handler.asm"
print "End of object_handler.asm ", pc print "End of object_handler.asm ", pc
incsrc "Dungeons/together_warp_tag.asm" incsrc "Dungeons/together_warp_tag.asm"
print "End of together_warp_tag.asm ", pc
incsrc "Dungeons/spike_subtype.asm" incsrc "Dungeons/spike_subtype.asm"
print "End of spike_subtype.asm ", pc
incsrc "Dungeons/house_tag.asm" incsrc "Dungeons/house_tag.asm"
print "End of house_tag.asm ", pc print "End of house_tag.asm ", pc

22
Dungeons/house_tag.asm
View File

@@ -119,19 +119,21 @@ pushpc
; TODO: Investigate if this is the best way to fix this. ; TODO: Investigate if this is the best way to fix this.
org $028364 org $028364
#_028364: LDA.b #$00 ; Fixed color RGB: #808000 {
#_028366: STA.b $9C #_028364: LDA.b #$00 ; Fixed color RGB: #808000
#_028366: STA.b $9C
#_028368: LDA.b #$00 #_028368: LDA.b #$00
#_02836A: STA.b $9D #_02836A: STA.b $9D
#_02836C: LDA.b #$00 #_02836C: LDA.b #$00
#_02836E: STA.b $9E #_02836E: STA.b $9E
#_028370: LDA.b #$00 #_028370: LDA.b #$00
#_028372: STA.l $7EC005 #_028372: STA.l $7EC005
#_028376: STA.l $7EC006 #_028376: STA.l $7EC006
#_02837A: JSL $079A2C ; Link_TuckIntoBed #_02837A: JSL $079A2C ; Link_TuckIntoBed
}
; ========================================================= ; =========================================================
; Dying Uncle Code Hook ; Dying Uncle Code Hook

2
Dungeons/spike_subtype.asm
View File

@@ -45,4 +45,6 @@ LDA $0D40, X : EOR.b #$FF : INC A : STA $0D40, X
LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong
RTL RTL
print "End of spike_subtype.asm ", pc
pushpc pushpc

2
Dungeons/together_warp_tag.asm
View File

@@ -25,7 +25,6 @@ org $01CC5A
; ============================================================================== ; ==============================================================================
pullpc ; Bank 0x2C pullpc ; Bank 0x2C
print "Warp Tag", pc
WarpTag: WarpTag:
{ {
PHX PHX
@@ -44,6 +43,7 @@ WarpTag:
PLX PLX
JML WarpTag_Return JML WarpTag_Return
} }
print "End of together_warp_tag.asm ", pc
pushpc pushpc
; ============================================================================== ; ==============================================================================

11
Sprites/Enemies/deku_scrub_enemy.asm
View File

@@ -229,7 +229,7 @@ SpawnPeaShot:
{ {
LDA.b #$14 LDA.b #$14
JSL Sprite_SpawnDynamically : BMI .return ;89 JSL Sprite_SpawnDynamically : BMI .return ;89
;store the sub-type
LDA.b #$01 : STA $0E30, Y LDA.b #$01 : STA $0E30, Y
LDA.b #$06 : STA $0D80, Y LDA.b #$06 : STA $0D80, Y
@@ -239,18 +239,15 @@ SpawnPeaShot:
REP #$20 REP #$20
LDA $0FD8 LDA $0FD8
SEP #$20 SEP #$20
STA $0D10, Y STA $0D10, Y : XBA : STA $0D30, Y
XBA : STA $0D30, Y
REP #$20 REP #$20
LDA $0FDA : CLC : ADC.w #$000C LDA $0FDA : CLC : ADC.w #$000C
SEP #$20 SEP #$20
STA $0D00, Y STA $0D00, Y : XBA : STA $0D20, Y
XBA : STA $0D20, Y
TYX TYX
STZ $0D70, X STZ $0D70, X
LDA #$10 : STA SprYSpeed, X LDA #$10 : STA SprYSpeed, X
@@ -266,8 +263,6 @@ SpawnPeaShot:
} }
Sprite_DekuScrubEnemy_Draw: Sprite_DekuScrubEnemy_Draw:
{ {
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord