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

Merge branch 'main' into kara

Browse Source
This commit is contained in:
karafruit
2023-03-13 21:33:27 -05:00
parent ad44b610fb 5a0990638c
commit 2a9b098dac
157 changed files with 9576 additions and 9736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
darkroomitems.asm
View File

@@ -1,8 +1,8 @@
CheckReceivedItemPropertiesBeforeLoad:
LDA $A0 : BEQ .normalCode
LDA $7EC005 : BNE .lightOff
LDA.b RoomIndex : BEQ .normalCode
LDA.l RoomFade : BNE .lightOff
.normalCode
JSL LoadReceivedItemExpandedProperties ; get palette
LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
RTL
.lightOff
@@ -10,18 +10,18 @@ CheckReceivedItemPropertiesBeforeLoad:
JSL LoadReceivedItemExpandedProperties ; get palette
REP #$30
AND #$0007 ; mask out palette
AND.w #$0007 ; mask out palette
ASL #5 ; multiply by 32
ADC #$C610 ; offset to latter half
ADC.w #$C610 ; offset to latter half
TAX ; give to destination
LDY #$C610 ; target palette SP0 colors 8-F
LDY.w #$C610 ; target palette SP0 colors 8-F
LDA #$000F ; 16 bytes
LDA.w #$000F ; 16 bytes
MVN $7E, $7E ; move palette
SEP #$30
PLB : PLY : PLX
INC $15
LDA #$00
INC.b NMICGRAM
LDA.b #$00
RTL