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

add minecart track starting positions and update ranch girl sprite inclusion

Browse Source
This commit is contained in:
scawful
2025-12-09 08:02:38 -05:00
parent 57012b2656
commit 7453dbdfdd
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sprites/Objects/data/minecart_tracks.asm Normal file
View File

@@ -0,0 +1,22 @@
; This is which room each track should start in if it hasn't already
; been given a track.
.TrackStartingRooms
dw $0098, $0088, $0087, $0088, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
; This is where within the room each track should start in if it hasn't
; already been given a position. This is necessary to allow for more
; than one stopping point to be in one room.
.TrackStartingX
dw $1190, $1160, $1300, $1100, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
.TrackStartingY
dw $1380, $10C9, $1100, $10D0, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100

8
Sprites/all_sprites.asm
View File

@@ -246,10 +246,6 @@ Sprite_IceBlock = $D5
incsrc "Sprites/Objects/ice_block.asm"
%log_end("ice_block", !LOG_SPRITES)
%log_start("ranch_girl", !LOG_SPRITES)
incsrc "Sprites/NPCs/ranch_girl.asm"
%log_end("ranch_girl", !LOG_SPRITES)
assert pc() <= $328000
%log_end("Bank 31", !LOG_SPRITES)
@@ -290,6 +286,10 @@ incsrc "Sprites/Bosses/arrghus.asm"
incsrc "Sprites/NPCs/fortune_teller.asm"
%log_end("fortune_teller", !LOG_SPRITES)
%log_start("ranch_girl", !LOG_SPRITES)
incsrc "Sprites/NPCs/ranch_girl.asm"
%log_end("ranch_girl", !LOG_SPRITES)
%log_end("Bank 32", !LOG_SPRITES)
; =========================================================