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

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	bookofmudora.asm
This commit is contained in:
aerinon
2023-09-01 11:37:46 -06:00
parent 5ccdebe09d 6fbce240b8
commit aecc65595e
10 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
utilities.asm
View File

@@ -406,22 +406,22 @@ LoadItemPalette:
TXA : ASL : TAX
LDA.l SpriteProperties_palette_addr,X : STA.b Scrap0A
LDY.w #$000E
LDA.w RoomIndex : CMP.w #$008C : BEQ .aux
LDA.w TransparencyFlag : BNE .SP05
JSR.w GTTorchCheck : BCS .aux
LDA.w TransparencyFlag : BNE .SP05
-
LDA.b [Scrap0A], Y
STA.w PaletteBuffer+$0170,Y
DEY #2
BPL -
LDA.w #$0003
BRA .done
.SP05
-
LDA.b [Scrap0A], Y
STA.w PaletteBuffer+$0170,Y
STA.w PaletteBuffer+$01B0,Y
DEY #2
BPL -
LDA.w #$0003
BRA .done
.SP05
-
LDA.b [Scrap0A], Y
STA.w PaletteBuffer+$01B0,Y
DEY #2
BPL -
LDA.w #$0005
LDA.w #$0005
.done
SEP #$30
PLB : PLY : PLX
@@ -463,3 +463,19 @@ ItemReceiptWidthCheck:
PLX
LDA.l SpriteProperties_standing_width, X
RTL
GTTorchCheck:
PHX
SEP #$30
LDA.w RoomIndex : CMP.b #$8C : BNE .done
LDX.w CurrentSpriteSlot
LDA.w SpriteTypeTable,X : CMP.b #$3B : BNE .done; Bonk Item
SEC
REP #$30
PLX
RTS
.done
CLC
REP #$30
PLX
RTS