Whitespace housekeeping
This commit is contained in:
@@ -56,6 +56,7 @@ Sprite_Octorok_Prep:
|
||||
{
|
||||
PHB : PHK : PLB
|
||||
|
||||
; TODO Check if the sprite is placed in water
|
||||
|
||||
PLB
|
||||
RTL
|
||||
|
||||
@@ -472,7 +472,6 @@ HandleTileDirections:
|
||||
LDA #$40 : STA.w SprTimerD, X
|
||||
%GotoAction(6) ; Minecart_Release
|
||||
RTS
|
||||
|
||||
.not_out_of_bounds
|
||||
; Check if the tile is a stop tile
|
||||
CMP.b #$B7 : BEQ .stop_north
|
||||
@@ -486,12 +485,10 @@ HandleTileDirections:
|
||||
LDA.b #South : STA.w SprSubtype, X : STA.w !MinecartDirection
|
||||
LDA #$01 : STA !SpriteDirection, X
|
||||
JMP .go_vert
|
||||
|
||||
.stop_south
|
||||
; Set the new direction to south and flip the cart's orientation
|
||||
LDA.b #North : STA.w SprSubtype, X : STZ.w !MinecartDirection
|
||||
LDA #$00 : STA !SpriteDirection, X
|
||||
|
||||
; -----------------------------------------------
|
||||
.go_vert
|
||||
%SetTimerA($40)
|
||||
@@ -499,18 +496,15 @@ HandleTileDirections:
|
||||
%GotoAction(1) ; Minecart_WaitVert
|
||||
JSL Link_ResetProperties_A
|
||||
RTS
|
||||
|
||||
.stop_east
|
||||
; Set the new direction to east and flip the cart's orientation
|
||||
LDA.b #West : STA.w SprSubtype, X : STA.w !MinecartDirection
|
||||
LDA #$02 : STA !SpriteDirection, X
|
||||
JMP .go_horiz
|
||||
|
||||
.stop_west
|
||||
; Set the new direction to west and flip the cart's orientation
|
||||
LDA.b #East : STA.w SprSubtype, X : STA.w !MinecartDirection
|
||||
LDA #$03 : STA !SpriteDirection, X
|
||||
|
||||
; -----------------------------------------------
|
||||
.go_horiz
|
||||
%SetTimerA($40)
|
||||
@@ -549,7 +543,6 @@ HandleTileDirections:
|
||||
.inverse_vert_velocity
|
||||
LDA.b #-!MinecartSpeed : STA.w SprYSpeed, X
|
||||
JMP .done
|
||||
|
||||
.check_direction
|
||||
LDA.w SprSubtype, X
|
||||
ASL #2 ; Multiply by 4 (shifting left by 2 bits) to offset rows in the lookup table
|
||||
@@ -624,7 +617,6 @@ HandleDynamicSwitchTileDirections:
|
||||
JSL Link_SetupHitBox
|
||||
JSL Sprite_SetupHitBox ; X is now the ID of the sprite $B0
|
||||
PLX
|
||||
|
||||
JSL CheckIfHitBoxesOverlap : BCC .no_b0
|
||||
LDA !MinecartDirection : CMP.b #$00 : BEQ .east_or_west
|
||||
CMP.b #$01 : BEQ .north_or_south
|
||||
@@ -674,7 +666,6 @@ CheckSpritePresence:
|
||||
LDX.b #$10
|
||||
.x_loop
|
||||
DEX
|
||||
|
||||
LDY.b #$04
|
||||
.y_loop
|
||||
DEY
|
||||
@@ -712,7 +703,6 @@ CheckForPlayerInput:
|
||||
CMP.b #$BD : BEQ .can_input
|
||||
BRA .cant_input
|
||||
.can_input
|
||||
|
||||
LDY !SpriteDirection, X
|
||||
LDA $F0 : AND .d_pad_press, Y : STA $00 : AND.b #$08 : BEQ .not_pressing_up
|
||||
LDA.b #$00 : STA !SpriteDirection, X ; Moving Up
|
||||
@@ -817,11 +807,8 @@ Sprite_Minecart_DrawTop:
|
||||
LDA .properties, X : STA ($90), Y
|
||||
|
||||
PHY
|
||||
|
||||
TYA : LSR #2 : TAY
|
||||
|
||||
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
|
||||
|
||||
PLY : INY
|
||||
PLX : DEX : BPL .nextTile
|
||||
|
||||
@@ -879,7 +866,6 @@ Sprite_Minecart_DrawBottom:
|
||||
.nextTile
|
||||
|
||||
PHX ; Save current Tile Index?
|
||||
|
||||
TXA : CLC : ADC $06 ; Add Animation Index Offset
|
||||
|
||||
PHA ; Keep the value with animation index offset?
|
||||
@@ -907,13 +893,9 @@ Sprite_Minecart_DrawBottom:
|
||||
LDA .properties, X : STA ($90), Y
|
||||
|
||||
PHY
|
||||
|
||||
TYA : LSR #2 : TAY
|
||||
|
||||
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
|
||||
|
||||
PLY : INY
|
||||
|
||||
PLX : DEX : BPL .nextTile
|
||||
|
||||
PLX
|
||||
@@ -992,3 +974,4 @@ JML RoomTag_ShutterDoorRequiresCart
|
||||
; #_01CC0A: BRA RoomTag_TriggerHoles
|
||||
|
||||
pullpc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user