Skip to content
This repository has been archived by the owner on May 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #62 from SubconsciousEye/master
Browse files Browse the repository at this point in the history 
Various Graphical Adjustments
  • Loading branch information
@TheLX5
TheLX5 authored Feb 15, 2020
2 parents 03e1522 + 6702b5c commit ba6a13d
Show file tree
Hide file tree
Showing 40 changed files with 195 additions and 143 deletions.
Binary file modified pixi/extended/powerup/boomerang_gfx.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/big_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/boomerang_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/cat_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/cat_tiles.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/frog_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/mini_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/penguin_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/powerup_items.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/raccoon_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/shell_mario.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/tail_tiles.bin
View file
Binary file not shown.
Binary file modified powerups_files/graphics/tanooki_mario.bin
View file
Binary file not shown.
5 changes: 4 additions & 1 deletion powerups_files/hex_edits.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,7 @@ backup77:
LDA $77
STA !ram_77_backup
org $00C599|!base3
dw backup77
dw backup77

org $00D1AE|!base3 ;Animation frame for Mario entering horizontal pipe on Yoshi
db $1D ;Remapped from $29 to $1D (Ducking with Item/Ducking on Yoshi)
2 changes: 1 addition & 1 deletion powerups_files/powerup_defs/powerup_05.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
!boomerang_pro_tile_1 = $80 ;Boomerang tile #1
!boomerang_pro_tile_2 = $80 ;Boomerang tile #2
;Those aren't used if you are using the projectile DMA feature!
!boomerang_ext_prop = $0A ;YXPPCCCT properties of the boomerang projectile.
!boomerang_ext_prop = $06 ;YXPPCCCT properties of the boomerang projectile.

!boomerang_ext_num = $14 ;Extended sprite number for Boomerangs.

Expand Down
162 changes: 94 additions & 68 deletions powerups_files/powerup_image_code/powerup_06.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
sta $13E0|!base2
lda .turn,x
sta $76
bra .tail
lda #$01 ;used to prevent player from
sta $13DB|!base2 ;"jittering" during tail-attack
bra .tail ;while walking (stz didn't work well)
.no_spin
cmp #$FD
bne .tail
Expand All @@ -41,18 +43,29 @@
lda .tile,x
sta !extra_tile_frame

lda !timer
beq .no_spin_tail
lsr #2
and #$01
lda $187A|!base2 ;check if player riding yoshi
cmp #$01 ;AND if they aren't turning while
bne .no_floor ;on yoshi
phx
ldx $13DB|!base2 ;player walk frames
lda.w .tail_yoshi,x ;load tail anims while on yoshi
ldx $18DC|!base2 ;check crouching on yoshi
beq +
lda #$02
sta !extra_tile_frame
bra .no_anim
+
lda #$04
sta !extra_tile_frame
bra .no_anim
+ sta !extra_tile_frame
plx
; lda !timer
; beq .no_spin_tail
; lsr #2
; and #$01
; beq +
; lda #$02
; sta !extra_tile_frame
; bra .no_anim
;+
; lda #$04
; sta !extra_tile_frame
; bra .no_anim
.no_spin_tail
lda $77
and #$04
Expand All @@ -63,26 +76,28 @@
ora $13E3|!base2
ora $13F3|!base2
bne .no_floor
lda $14
lsr #3
and #$01
beq +
lda #$0C
sta !extra_tile_frame
bra .no_floor
+
lda #$02
sta !extra_tile_frame
; lda $14
; lsr #3
; and #$01
; beq +
; lda #$0C
; sta !extra_tile_frame
; bra .no_floor
;+
; lda #$02
; sta !extra_tile_frame
.no_floor
lda !power_ram+1
beq .no_anim
dec
sta !power_ram+1
lsr #2
and #$03
phx
tax
lda .hover_anim,x
sta !extra_tile_frame
plx
.no_anim
txa
asl
Expand All @@ -104,64 +119,75 @@
rts

.offset_x
dw $FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8
dw $FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$0000
dw $FFF2,$FFF2,$FFF2,$FFF2,$FFF8,$0000,$FFF8,$FFF8
dw $FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$0000,$0000
dw $FFF6,$FFF8,$0000,$0000,$FFF8,$0000,$0000,$FFF6
dw $FFF6,$FFF6,$0000,$0000,$0000,$0000,$0000,$0000
dw $FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8,$FFF8
dw $0000,$0000,$FFF8,$FFF8,$FFF8,$FFF8,$0000,$FFF8
dw $FFF8,$FFF8,$0000,$0000,$0000,$0000,$FFF8
dw $FFF9,$FFFA,$FFF9,$FFF9,$FFF9,$FFF9,$FFF9,$FFF9
dw $FFFA,$FFF9,$FFF9,$FFF9,$FFF9,$FFF8,$FFF9,$0000
dw $FFF7,$FFFA,$FFFA,$FFFA,$FFF9,$0000,$FFF9,$FFF9
dw $FFF9,$FFF9,$FFF9,$FFF9,$FFF8,$FFF7,$0002,$FFFA
dw $FFF8,$FFFC,$0000,$0000,$FFF9,$0000,$0000,$FFF8
dw $FFF8,$FFF8,$0000,$0000,$0000,$0000,$0000,$0000
dw $FFF8,$FFF8,$FFF8,$FFF9,$FFF9,$FFFC,$FFFA,$FFF7
dw $0000,$0000,$FFF8,$FFF8,$FFF7,$FFF8,$0000,$FFF8
dw $FFF8,$FFF8,$0000,$0000,$0000,$0000
dw $0000
dw $FFF8,$0000,$0000
..end
dw $0008,$0008,$0008,$0008,$0008,$0008,$0008,$0008
dw $0008,$0008,$0008,$0008,$0008,$0008,$0008,$0000
dw $000E,$000E,$000E,$000E,$0008,$0000,$0008,$0008
dw $0008,$0008,$0008,$0008,$0008,$0008,$0000,$0000
dw $000A,$0008,$0000,$0000,$0008,$0000,$0000,$000A
dw $000A,$000A,$0000,$0000,$0000,$0000,$0000,$0000
dw $0008,$0008,$0008,$0008,$0008,$0008,$0008,$0008
dw $0000,$0000,$0008,$0008,$0008,$0008,$0000,$0008
dw $0008,$0008,$0000,$0000,$0000,$0000,$0008
dw $0007,$0006,$0007,$0007,$0007,$0007,$0007,$0007
dw $0006,$0007,$0007,$0007,$0007,$0008,$0007,$0000
dw $000A,$0007,$0007,$0007,$0007,$0000,$0007,$0007
dw $0007,$0007,$0007,$0007,$0008,$0009,$FFFE,$0006
dw $0008,$0004,$0000,$0000,$0007,$0000,$0000,$0008
dw $0008,$0008,$0000,$0000,$0000,$0000,$0000,$0000
dw $0008,$0008,$0008,$0007,$0007,$0004,$0006,$0009
dw $0000,$0000,$0008,$0008,$0009,$0008,$0000,$0008
dw $0008,$0008,$0000,$0000,$0000,$0000
dw $0000
dw $0008,$0000,$0000
.offset_y
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0018,$0024,$0024,$0024,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0012,$0012,$0012,$0012,$0012
dw $0012,$0012,$0012,$0016,$0012,$0012,$0012
dw $0010,$0010,$0010,$0010,$0010,$0010,$0010,$0010
dw $0010,$0010,$0010,$0010,$0010,$0011,$0010,$0011
dw $0015,$001F,$001F,$001F,$0011,$0011,$0010,$0010
dw $0010,$0010,$0010,$0010,$0011,$0013,$0011,$0011
dw $0011,$0011,$0011,$0011,$0011,$0011,$0011,$0010
dw $0011,$0011,$0012,$0012,$0012,$0012,$0012,$0012
dw $0011,$0011,$0011,$0010,$0010,$0012,$0012,$0010
dw $0011,$0011,$0012,$0012,$0014,$0012,$0012,$0010
dw $0012,$0012,$0011,$0011,$0011,$0011
dw $8000
dw $0011,$0011,$0011
.tile
db $00,$02,$00,$00,$00,$02,$00,$00
db $02,$00,$00,$00,$02,$04,$00,$0A
db $04,$08,$08,$08,$00,$0A,$00,$00
db $02,$02,$00,$00,$0C,$00,$0A,$04
db $00,$04,$0A,$0A,$00,$0A,$0A,$00
db $00,$00,$00,$00,$00,$00,$00,$00
db $0C,$0C,$00,$00,$00,$00,$00,$00
db $0A,$0A,$00,$00,$00,$00,$00,$00
db $00,$00,$0A,$0A,$0A,$0A,$00
db $02,$08,$04,$02,$04,$04,$04,$02
db $08,$04,$02,$04,$04,$22,$02,$0A
db $00,$00,$00,$00,$02,$0A,$04,$04
db $04,$04,$04,$04,$24,$28,$0A,$02
db $02,$02,$0A,$0A,$04,$0A,$0A,$02
db $02,$02,$00,$00,$00,$00,$00,$00
db $20,$20,$02,$02,$02,$04,$02,$04
db $0A,$0A,$00,$00,$26,$00,$00,$00
db $00,$00,$0A,$0A,$0A,$0A
db $00
db $0C,$0E,$0E
..end
.settings
db $01,$01,$01,$01,$01,$01,$01,$01
db $01,$01,$01,$01,$01,$01,$01,$01
db $01,$01,$01,$01,$01,$11,$01,$01
db $01,$01,$01,$01,$01,$01,$11,$11
db $01,$01,$11,$11,$01,$11,$01,$01
db $01,$01,$00,$00,$00,$00,$00,$00
db $01,$01,$01,$01,$01,$01,$01,$01
db $01,$01,$01,$01,$01,$01,$01,$41
db $01,$01,$01,$01,$11,$11,$01,$01
db $01,$01,$01,$01,$01,$01,$51,$11
db $11,$01,$41,$01,$01,$11,$01,$11
db $11,$11,$00,$00,$00,$00,$00,$00
db $01,$01,$01,$01,$01,$11,$11,$11
db $11,$11,$01,$01,$01,$00,$00,$01
db $01,$01,$01,$01,$11,$01,$01
db $01,$01,$41,$41,$11,$41
db $00
db $01,$11,$41

.hover_anim
db $02,$04,$02,$06
db $06,$04,$02,$02
.pose
db $00,$25,$00,$0F
db $00,$0F,$00,$25
db $47,$48,$47,$49
db $47,$49,$47,$48
.turn
db $00,$00,$01,$01
db $01,$01,$00,$00

.tail_yoshi
db $02,$08,$04

Loading

0 comments on commit ba6a13d

Please sign in to comment.