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

8
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,6 +146,7 @@ Sprite_LeverSwitch_Main:
} }
} }
; =========================================================
Sprite_LeverSwitch_Draw: Sprite_LeverSwitch_Draw:
{ {
@@ -217,5 +224,4 @@ Sprite_LeverSwitch_Draw:
.sizes .sizes
db $02 db $02
db $02 db $02
} }

12
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,6 +158,7 @@ Sprite_RotatingTrack_Main:
} }
Sprite_RotatingTrack_Draw: Sprite_RotatingTrack_Draw:
{
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer JSL Sprite_OAM_AllocateDeferToPlayer
@@ -232,3 +243,4 @@ db $02
db $02 db $02
db $02 db $02
db $02 db $02
}