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

Various GFX fixes and merge stability updates

Browse Source
This commit is contained in:
codemann8
2024-03-20 17:48:43 -05:00
parent c2280b439e
commit 967bd79900
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rom.py
View File

@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '030a90f43980701de227341dd1a78a50' RANDOMIZERBASEHASH = '001235f09be679140ef2f940b8b7f5c2'
class JsonRom(object): class JsonRom(object):

7
asm/owrando.asm
View File

@@ -306,9 +306,9 @@ OWFluteCancel:
{ {
lda.l OWFlags+1 : and.b #$01 : bne + lda.l OWFlags+1 : and.b #$01 : bne +
jsl FluteMenu_LoadTransport : rtl jsl FluteMenu_LoadTransport : rtl
+ lda.l HexToDecDigit4 : cmp.b #$01 : beq + + lda.w RandoOverworldTargetEdge : bne +
jsl FluteMenu_LoadTransport jsl FluteMenu_LoadTransport
+ lda.b #$00 : sta.l HexToDecDigit4 : rtl + stz.w RandoOverworldTargetEdge : rtl
} }
OWFluteCancel2: OWFluteCancel2:
{ {
@@ -317,7 +317,7 @@ OWFluteCancel2:
+ inc.w SubModuleInterface + inc.w SubModuleInterface
lda.l OWFlags+1 : and.b #$01 : beq + lda.l OWFlags+1 : and.b #$01 : beq +
lda.b Joy1B_All : cmp.b #$40 : bne + lda.b Joy1B_All : cmp.b #$40 : bne +
lda.b #$01 : sta.l HexToDecDigit4 lda.b #$01 : sta.w RandoOverworldTargetEdge
+ rtl + rtl
} }
OWSmithAccept: OWSmithAccept:
@@ -587,6 +587,7 @@ OWBonkDrops:
.increment_collection .increment_collection
REP #$20 REP #$20
LDA.l TotalItemCounter : INC : STA.l TotalItemCounter LDA.l TotalItemCounter : INC : STA.l TotalItemCounter
INC.w UpdateHUDFlag
SEP #$20 SEP #$20
+ BRA .return + BRA .return

BIN
data/base2current.bps
View File

Binary file not shown.