From 2e7dff83d28bea6817a8a83cc5f3576b9060cae7 Mon Sep 17 00:00:00 2001 From: p4plus2 Date: Sun, 13 Aug 2017 01:56:07 -0400 Subject: [PATCH] Label formatting corrections --- bank_BC.asm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/bank_BC.asm b/bank_BC.asm index 3e18dad..6d33ac2 100644 --- a/bank_BC.asm +++ b/bank_BC.asm @@ -9842,7 +9842,7 @@ CODE_BCFAEA: BEQ CODE_BCFAFD ;$BCFAF8 | LDY #$09AB ;$BCFAFA | CODE_BCFAFD: ; | - JSR GetSpriteClipping ;$BCFAFD | + JSR get_sprite_clipping ;$BCFAFD | LDA #$09A3 ;$BCFB00 | JSR CODE_BCFBEE ;$BCFB03 | PLD ;$BCFB06 | @@ -9854,7 +9854,7 @@ CODE_BCFAFD: ; | BEQ CODE_BCFB1C ;$BCFB12 | PHD ;$BCFB14 | LDY #$09EB ;$BCFB15 | - JSR GetSpriteClipping ;$BCFB18 | + JSR get_sprite_clipping ;$BCFB18 | PLD ;$BCFB1B | CODE_BCFB1C: ; | RTL ;$BCFB1C / @@ -9862,7 +9862,7 @@ CODE_BCFB1C: ; | CODE_BCFB1D: PHD ;$BCFB1D \ LDY #$09AB ;$BCFB1E | - JSR GetSpriteClipping ;$BCFB21 | + JSR get_sprite_clipping ;$BCFB21 | LDA #$09A3 ;$BCFB24 | JSR CODE_BCFBEE ;$BCFB27 | PLD ;$BCFB2A | @@ -9878,7 +9878,7 @@ CODE_BCFB2C: STY $0D38 ;$BCFB3B | LDY #$09C3 ;$BCFB3E | CODE_BCFB41: ; | - JSR GetSpriteClipping ;$BCFB41 | + JSR get_sprite_clipping ;$BCFB41 | LDA #$09BB ;$BCFB44 | JSR CODE_BCFBEE ;$BCFB47 | PLD ;$BCFB4A | @@ -9892,7 +9892,7 @@ CODE_BCFB58: PHD ;$BCFB58 \ LDX $64 ;$BCFB59 | LDY #$09D3 ;$BCFB5B | - JSR GetSpriteClipping ;$BCFB5E | + JSR get_sprite_clipping ;$BCFB5E | JSR CODE_BCFBCC ;$BCFB61 | PLD ;$BCFB64 | STZ $09DF ;$BCFB65 | @@ -10044,7 +10044,7 @@ CODE_BCFC48: STA $04 ;$BCFC4A | RTS ;$BCFC4C / -GetSpriteClipping: +get_sprite_clipping: LDA $1A,x ;$BCFC4D \ Get clipping ID BEQ CODE_BCFC48 ;$BCFC4F | LSR A ;$BCFC51 | @@ -10061,26 +10061,26 @@ CODE_BCFC59: ; | PLD ;$BCFC5E | LDA $0006,x ;$BCFC5F | Get sprite X position BIT $0012,x ;$BCFC62 | - BVS .FlipClippingX ;$BCFC65 | + BVS .flip_x_clipping ;$BCFC65 | CLC ;$BCFC67 | ADC $0000,y ;$BCFC68 | Add clipping horizontal offset STA $00 ;$BCFC6B | Store leftmost position CLC ;$BCFC6D | ADC $0004,y ;$BCFC6E | Add clipping width STA $04 ;$BCFC71 | Store rightmost position - BRA .VerticalClipping ;$BCFC73 / + BRA .vertical_clipping ;$BCFC73 / -.FlipClippingX: +.flip_x_clipping SEC ;$BCFC75 \ SBC $0000,y ;$BCFC76 | Subtract clipping horizontal offset STA $04 ;$BCFC79 | Store rightmost position SEC ;$BCFC7B | SBC $0004,y ;$BCFC7C | Subtract clipping width STA $00 ;$BCFC7F | Store leftmost position -.VerticalClipping: ; | +.vertical_clipping ; | LDA $000A,x ;$BCFC81 | Get sprite Y position BIT $0012,x ;$BCFC84 | - BMI .FlipClippingY ;$BCFC87 | + BMI .flip_y_clipping ;$BCFC87 | CLC ;$BCFC89 | ADC $0002,y ;$BCFC8A | Add clipping vertical offset STA $02 ;$BCFC8D | Store top position @@ -10090,7 +10090,7 @@ CODE_BCFC59: ; | PLB ;$BCFC95 | RTS ;$BCFC96 / -.FlipClippingY: +.flip_y_clipping SEC ;$BCFC97 \ SBC $0002,y ;$BCFC98 | Subtract clipping vertical offset STA $06 ;$BCFC9B | Store bottom position @@ -10105,7 +10105,7 @@ CODE_BCFCA5: LDX $0597 ;$BCFCA7 | STX $6A ;$BCFCAA | LDY #$0018 ;$BCFCAC | - JSR CheckForCollision ;$BCFCAF | + JSR check_for_collision ;$BCFCAF | BCC CODE_BCFCC5 ;$BCFCB2 | RTL ;$BCFCB4 / @@ -10114,7 +10114,7 @@ CODE_BCFCB5: LDX $0593 ;$BCFCB7 | STX $6A ;$BCFCBA | LDY #$0000 ;$BCFCBC | - JSR CheckForCollision ;$BCFCBF | + JSR check_for_collision ;$BCFCBF | BCC CODE_BCFCC5 ;$BCFCC2 | RTL ;$BCFCC4 / @@ -10126,7 +10126,7 @@ CODE_BCFCC5: BEQ CODE_BCFCDD ;$BCFCCE | STX $6A ;$BCFCD0 | LDY #$0000 ;$BCFCD2 | - JSR CheckForCollision ;$BCFCD5 | + JSR check_for_collision ;$BCFCD5 | BCC CODE_BCFCDD ;$BCFCD8 | RTL ;$BCFCDA / @@ -10189,27 +10189,27 @@ CODE_BCFD56: ; | CMP #$0001 ;$BCFD5B | RTL ;$BCFD5E / -ReturnNoContact: +no_contact_return: CLC ;$BCFD5F \ RTS ;$BCFD60 / -CheckForCollision: +check_for_collision: STZ $09F5 ;$BCFD61 \ LDA $EB ;$BCFD64 | AND $30,x ;$BCFD66 | - BEQ ReturnNoContact ;$BCFD68 | + BEQ no_contact_return ;$BCFD68 | LDA $09B7,y ;$BCFD6A | Compare the right of the kong CMP $09E3 ;$BCFD6D | with the left of the sprite - BCC ReturnNoContact ;$BCFD70 | + BCC no_contact_return ;$BCFD70 | LDA $09E7 ;$BCFD72 | Compare the right of the sprite CMP $09B3,y ;$BCFD75 | with the left of the kong - BCC ReturnNoContact ;$BCFD78 | + BCC no_contact_return ;$BCFD78 | LDA $09E9 ;$BCFD7A | Compare the bottom of the sprite CMP $09B5,y ;$BCFD7D | with the top of the kong - BCC ReturnNoContact ;$BCFD80 | + BCC no_contact_return ;$BCFD80 | LDA $09B9,y ;$BCFD82 | Compare the bottom of the kong CMP $09E5 ;$BCFD85 | with the top of the sprite - BCC ReturnNoContact ;$BCFD88 | + BCC no_contact_return ;$BCFD88 | LDA $09AF,y ;$BCFD8A | BEQ CODE_BCFDB2 ;$BCFD8D | CMP $09D3 ;$BCFD8F |