alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ROM Fixes

Browse Source 
- Fix standing item dupe respawns
- Fix Hera boss room falling fade out
This commit is contained in:
codemann8
2023-10-10 02:08:36 -05:00
parent a1f2ee8d91
commit 8b5c5ce254
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rom.py
View File

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '52317b2dd4fb303887f26ecc40a4cae3' RANDOMIZERBASEHASH = 'de030c9fec5157af4ad1cf1948428210'
class JsonRom(object): class JsonRom(object):

16
asm/owrando.asm
View File

@@ -169,11 +169,6 @@ plb : rtl
nop #3 nop #3
+ +
; follower hooks
;org $8689D9
;SpritePrep_BombShoppe:
;JML BombShoppe_ConditionalSpawn : NOP
;Code ;Code
org $aa8800 org $aa8800
OWTransitionDirection: OWTransitionDirection:
@@ -541,7 +536,6 @@ OWBonkDrops:
INX : LDA.w OWBonkPrizeData,X : PHX : PHA ; S = FlagBitmask, X (row + 2) INX : LDA.w OWBonkPrizeData,X : PHX : PHA ; S = FlagBitmask, X (row + 2)
LDX.b $8A : LDA.l OverworldEventDataWRAM,X : AND 1,S : PHA : BNE + ; S = Collected, FlagBitmask, X (row + 2) LDX.b $8A : LDA.l OverworldEventDataWRAM,X : AND 1,S : PHA : BNE + ; S = Collected, FlagBitmask, X (row + 2)
LDA.b #$1B : STA $12F ; JSL Sound_SetSfx3PanLong ; seems that when you bonk, there is a pending bonk sfx, so we clear that out and replace with reveal secret sfx LDA.b #$1B : STA $12F ; JSL Sound_SetSfx3PanLong ; seems that when you bonk, there is a pending bonk sfx, so we clear that out and replace with reveal secret sfx
; JSLSpriteSFX_QueueSFX3WithPan
+ +
LDA 3,S : TAX : INX : LDA.w OWBonkPrizeData,X LDA 3,S : TAX : INX : LDA.w OWBonkPrizeData,X
PHA : INX : LDA.w OWBonkPrizeData,X : BEQ + PHA : INX : LDA.w OWBonkPrizeData,X : BEQ +
@@ -873,7 +867,6 @@ OWNewDestination:
++ lda $84 : !add 1,s : sta $84 : pla : pla ++ lda $84 : !add 1,s : sta $84 : pla : pla
.adjustMainAxis .adjustMainAxis
;LDA $84 : SEC : SBC #$0400 : AND #$0F80 : ASL : XBA : STA $88 ; vram
LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 ; vram LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 ; vram
LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86 LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86
@@ -936,7 +929,6 @@ OWNewDestination:
sep #$30 : lda $04 : and #$3f : !add OWOppSlotOffset,y : asl : sta $700 sep #$30 : lda $04 : and #$3f : !add OWOppSlotOffset,y : asl : sta $700
; crossed OW shuffle and terrain ; crossed OW shuffle and terrain
;lda $8a : JSR OWDetermineScreensPaletteSet : STX $04
ldx $05 : ldy $08 : jsr OWWorldTerrainUpdate ldx $05 : ldy $08 : jsr OWWorldTerrainUpdate
ldx $8a : lda $05 : sta $8a : stx $05 ; $05 is prev screen id, $8a is dest screen ldx $8a : lda $05 : sta $8a : stx $05 ; $05 is prev screen id, $8a is dest screen
@@ -1161,14 +1153,6 @@ OWEndScrollTransition:
RTL RTL
} }
; BombShoppe_ConditionalSpawn:
; {
; nop
; INC.w $0BA0,X : LDA.b #$B5 ; what we wrote over
; JML SpritePrep_BombShoppe+5
; nop#20
; }
;Data ;Data
org $aaa000 org $aaa000
OWEdgeOffsets: OWEdgeOffsets:

BIN
data/base2current.bps
View File

Binary file not shown.