Housekeeping, whitespace cleanup

This commit is contained in:
scawful
2024-11-09 21:26:39 -05:00
parent 6b3118b14b
commit e3056ca827
10 changed files with 257 additions and 263 deletions

View File

@@ -1,5 +1,5 @@
; =============================================================================
; Bottle Net Code
; Bottle Net Code
; =============================================================================
!BottleFlag = $0AA6
@@ -12,26 +12,26 @@ PlayerItem_ReleaseBee = $1EDCCF
org $07A15B
LinkItem_NewBottle:
{
{
; Check if we have a bottle or not
LDA $7EF34F : DEC A : TAX
LDA $7EF35C, X : BEQ .exit
; Check if the bottle is empty
; Check if the bottle is empty
CMP.b #$03 : BCC .empty_bottle
; Confirm we aren't currently catching
LDA $030D : BNE .empty_bottle
; If no, prepare and call the LinkItem_Bottles routine
; If no, prepare and call the LinkItem_Bottles routine
JSR LinkItem_Bottles
BRA .exit
.empty_bottle
; Otherwise, prepare and call the LinkItem_BugCatchingNet routine
JSR LinkItem_CatchBottle
.exit
.exit
RTS
}
@@ -57,30 +57,30 @@ pose_offset:
; *$3AFF8-$3B072 LOCAL
LinkItem_CatchBottle:
{
{
BIT $3A : BVS .y_press
LDA $6C : BNE .bottle_exit ; (RTS)
JSR Link_CheckNewY_ButtonPress : BCC .bottle_exit ; (RTS)
LDA $2F : LSR A : TAY
LDX pose_offset, Y
LDA.w pose_id, X : STA $0300
LDA.b #$03 : STA $3D
STZ $030D, X
LDA.b #$10 : STA $037A
LDA.b #$01 : TSB $50
STZ $2E
LDA.b #$32 : JSR Player_DoSfx2
.y_press:
JSR $AE65 ; HaltLinkWhenUsingItems
LDA $67 : AND.b #$F0 : STA $67
DEC $3D : BPL .bottle_exit
LDX $030D : INX : STX $030D
@@ -89,13 +89,13 @@ LinkItem_CatchBottle:
LDA.w pose_offset, Y : CLC : ADC $030D : TAY
LDA.w pose_id, Y : STA $0300
CPX.b #$0A : BNE .bottle_exit
STZ $030D
STZ $0300
LDA $3A : AND.b #$80 : STA $3A
STZ $037A
LDA $50 : AND.b #$FE : STA $50
LDA.b #$80 : STA $44 : STA $45
@@ -109,12 +109,12 @@ print " LinkItem_Bottles ", pc
LinkItem_Bottles:
{
JSR Link_CheckNewY_ButtonPress : BCC NetExit ; (RTS)
LDA.b $3A : AND.b #$BF : STA.b $3A
; Check if we have a bottle or not
LDA.l $7EF34F : DEC A : TAX
LDA.l $7EF35C, X : BEQ NetExit ; (RTS)
CMP.b #$03 : BCC .LinkItem_UselessBottle
CMP.b #$03 : BEQ .LinkItem_RedPotion
@@ -142,18 +142,18 @@ LinkItem_Bottles:
LDA.l $7EF36C : CMP.l $7EF36D : BNE .can_drink_red
.LinkItem_UselessBottle
BRL LinkGoBeep ; BRL $07A955 Investigate
BRL LinkGoBeep ; BRL $07A955 Investigate
.can_drink_red
LDA.b #$02 : STA.l $7EF35C, X : STZ.w $0301
LDA.b #$04 : STA.b $11
LDA.b $10 : STA.w $010C
LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208
JSL RebuildHUD_long
RTS
.LinkItem_GreenPotion
@@ -167,7 +167,7 @@ LinkItem_Bottles:
; submodule ????
LDA.b #$08 : STA.b $11
LDA.b $10 : STA.w $010C
; Go to text mode
LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208
@@ -182,15 +182,15 @@ LinkItem_Bottles:
.useBluePotion
LDA.b #$02 : STA $7EF35C, X : STZ $0301
; more submodule code
; more submodule code
LDA.b #$09 : STA.b $11
LDA.b $10 : STA.w $010C
; Go to text mode (?)
LDA.b #$0E : STA.b $10
LDA.b #$07 : STA.w $0208
JSL RebuildHUD_long
BRA .bottle_exit
@@ -230,4 +230,4 @@ Bottle_DrinkMilk:
}
print "End of Items/bottle_net.asm ", pc
pushpc
pushpc