diff --git a/Sprites/Objects/data/minecart_tracks.asm b/Sprites/Objects/data/minecart_tracks.asm new file mode 100644 index 0000000..c26c1de --- /dev/null +++ b/Sprites/Objects/data/minecart_tracks.asm @@ -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 diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm index 29e9b54..49de2ba 100644 --- a/Sprites/all_sprites.asm +++ b/Sprites/all_sprites.asm @@ -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) ; =========================================================