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

Update switch and track sprite format for code review

Browse Source
This commit is contained in:
scawful
2024-03-28 19:57:08 -04:00
parent dad37bdee7
commit 4c4f531929
2 changed files with 138 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Sprites/Objects/mineswitch.asm
View File

@@ -1,3 +1,6 @@
; =========================================================
; Sprite Properties
; =========================================================
!SPRID = $AF ; The sprite ID you are overwriting (HEX) !SPRID = $AF ; The sprite ID you are overwriting (HEX)
!NbrTiles = 02 ; Number of tiles used in a frame !NbrTiles = 02 ; Number of tiles used in a frame
@@ -29,6 +32,7 @@
%Set_Sprite_Properties(Sprite_LeverSwitch_Prep, Sprite_LeverSwitch_Long); %Set_Sprite_Properties(Sprite_LeverSwitch_Prep, Sprite_LeverSwitch_Long);
; =========================================================
Sprite_LeverSwitch_Long: Sprite_LeverSwitch_Long:
{ {
@@ -45,6 +49,7 @@ Sprite_LeverSwitch_Long:
RTL ; Go back to original code RTL ; Go back to original code
} }
; =========================================================
Sprite_LeverSwitch_Prep: Sprite_LeverSwitch_Prep:
{ {
@@ -57,6 +62,7 @@ Sprite_LeverSwitch_Prep:
RTL RTL
} }
; =========================================================
Sprite_LeverSwitch_Main: Sprite_LeverSwitch_Main:
{ {
@@ -140,82 +146,82 @@ Sprite_LeverSwitch_Main:
} }
} }
; =========================================================
Sprite_LeverSwitch_Draw: Sprite_LeverSwitch_Draw:
{ {
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer JSL Sprite_OAM_AllocateDeferToPlayer
LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
LDA .start_index, Y : STA $06 LDA .start_index, Y : STA $06
PHX PHX
LDX .nbr_of_tiles, Y ;amount of tiles -1 LDX .nbr_of_tiles, Y ;amount of tiles -1
LDY.b #$00 LDY.b #$00
.nextTile .nextTile
PHX ; Save current Tile Index? PHX ; Save current Tile Index?
TXA : CLC : ADC $06 ; Add Animation Index Offset TXA : CLC : ADC $06 ; Add Animation Index Offset
PHA ; Keep the value with animation index offset? PHA ; Keep the value with animation index offset?
ASL A : TAX ASL A : TAX
REP #$20 REP #$20
LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
AND.w #$0100 : STA $0E AND.w #$0100 : STA $0E
INY INY
LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
CLC : ADC #$0010 : CMP.w #$0100 CLC : ADC #$0010 : CMP.w #$0100
SEP #$20 SEP #$20
BCC .on_screen_y BCC .on_screen_y
LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
STA $0E STA $0E
.on_screen_y .on_screen_y
PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore) PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore)
INY INY
LDA .chr, X : STA ($90), Y LDA .chr, X : STA ($90), Y
INY INY
LDA .properties, X : STA ($90), Y LDA .properties, X : STA ($90), Y
PHY PHY
TYA : LSR #2 : TAY TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
PLX : DEX : BPL .nextTile PLX : DEX : BPL .nextTile
PLX PLX
RTS RTS
.start_index .start_index
db $00, $01 db $00, $01
.nbr_of_tiles .nbr_of_tiles
db 0, 0 db 0, 0
.x_offsets .x_offsets
dw 0 dw 0
dw 0 dw 0
.y_offsets .y_offsets
dw 0 dw 0
dw 0 dw 0
.chr .chr
db $64 db $64
db $66 db $66
.properties .properties
db $37 db $37
db $37 db $37
.sizes .sizes
db $02 db $02
db $02 db $02
} }

150
Sprites/Objects/switch_track.asm
View File

@@ -1,3 +1,7 @@
; =========================================================
; Sprite Properties
; =========================================================
!SPRID = $B0 ; The sprite ID you are overwriting (HEX) !SPRID = $B0 ; The sprite ID you are overwriting (HEX)
!NbrTiles = 04 ; Number of tiles used in a frame !NbrTiles = 04 ; Number of tiles used in a frame
!Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless
@@ -28,6 +32,8 @@
%Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long); %Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long);
; =========================================================
Sprite_RotatingTrack_Long: Sprite_RotatingTrack_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -43,6 +49,8 @@ Sprite_RotatingTrack_Long:
RTL ; Go back to original code RTL ; Go back to original code
} }
; =========================================================
; Modes ; Modes
; 0 = TopLeft -> TopRight ; 0 = TopLeft -> TopRight
; 1 = TopRight -> BottomRight ; 1 = TopRight -> BottomRight
@@ -61,6 +69,8 @@ Sprite_RotatingTrack_Prep:
RTL RTL
} }
; =========================================================
SwitchRam = $37 SwitchRam = $37
Sprite_RotatingTrack_Main: Sprite_RotatingTrack_Main:
@@ -148,87 +158,89 @@ Sprite_RotatingTrack_Main:
} }
Sprite_RotatingTrack_Draw: Sprite_RotatingTrack_Draw:
JSL Sprite_PrepOamCoord {
JSL Sprite_OAM_AllocateDeferToPlayer JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer
LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
LDA .start_index, Y : STA $06 LDA .start_index, Y : STA $06
PHX PHX
LDX .nbr_of_tiles, Y ;amount of tiles -1 LDX .nbr_of_tiles, Y ;amount of tiles -1
LDY.b #$00 LDY.b #$00
.nextTile .nextTile
PHX ; Save current Tile Index? PHX ; Save current Tile Index?
TXA : CLC : ADC $06 ; Add Animation Index Offset TXA : CLC : ADC $06 ; Add Animation Index Offset
PHA ; Keep the value with animation index offset? PHA ; Keep the value with animation index offset?
ASL A : TAX ASL A : TAX
REP #$20 REP #$20
LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
AND.w #$0100 : STA $0E AND.w #$0100 : STA $0E
INY INY
LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
CLC : ADC #$0010 : CMP.w #$0100 CLC : ADC #$0010 : CMP.w #$0100
SEP #$20 SEP #$20
BCC .on_screen_y BCC .on_screen_y
LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
STA $0E STA $0E
.on_screen_y .on_screen_y
PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore) PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore)
INY INY
LDA .chr, X : STA ($90), Y LDA .chr, X : STA ($90), Y
INY INY
LDA .properties, X : STA ($90), Y LDA .properties, X : STA ($90), Y
PHY PHY
TYA : LSR #2 : TAY TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
PLX : DEX : BPL .nextTile PLX : DEX : BPL .nextTile
PLX PLX
RTS RTS
.start_index .start_index
db $00, $01, $02, $03 db $00, $01, $02, $03
.nbr_of_tiles .nbr_of_tiles
db 0, 0, 0, 0 db 0, 0, 0, 0
.x_offsets .x_offsets
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
.y_offsets .y_offsets
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
.chr .chr
db $44 db $44
db $44 db $44
db $44 db $44
db $44 db $44
.properties .properties
db $7D db $7D
db $3D db $3D
db $FD db $FD
db $BD db $BD
.sizes .sizes
db $02 db $02
db $02 db $02
db $02 db $02
db $02 db $02
}