Update to latest baserom (has some MSU-1 stuff)

Minor fix to Armory S door - can't seem to get it right
Minor fix to spirals that cross the horiz quadrant boundary while traversing
This commit is contained in:
randall.rupper
2019-09-18 13:01:35 -06:00
parent 292af3241c
commit 2f659da39f
6 changed files with 11 additions and 9 deletions

View File

@@ -60,8 +60,8 @@ PrepTransAuxGfx:
;Dungeon_LoadCustomTileAttr:
;org $01fec1
;Dungeon_ApproachFixedColor_variable:
org $a0f432 ; Rando version -- needs to be after hooks and loadroom.asm I think?
Dungeon_LoadRoom_RANDO:
;org $a0f972 ; Rando version
;LoadRoomHook:
org $1bee74 ;(PC: 0dee74)
Palette_DungBgMain:
org $1bec77

View File

@@ -1,7 +1,7 @@
GfxFixer:
{
lda $b1 : bne .stage2
jsl Dungeon_LoadRoom_RANDO ; let's only call this guy once - may fix star tiles and slower loads
jsl LoadRoomHook ; this is the rando version - let's only call this guy once - may fix star tiles and slower loads
jsl Dungeon_InitStarTileCh
jsl LoadTransAuxGfx
;jsl Dungeon_LoadCustomTileAttr

View File

@@ -23,8 +23,10 @@ SpiralWarp: {
lda $00 : sta $a0
; shift quadrant if necessary
lda $01 : and #$01 : !sub $a9
beq .skipXQuad
sta $06 : !add $a9 : sta $a9
bne .xQuad
lda $22 : bne .skipXQuad ; this is an edge case
dec $23 : bra .skipXQuad ; need to -1 if $22 is 0
.xQuad sta $06 : !add $a9 : sta $a9
ldy #$00 : jsr ShiftQuadSimple
.skipXQuad