scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add palette buffer and cgram labels to time system

Browse Source
This commit is contained in:
scawful
2024-08-17 15:37:39 -04:00
parent 1d4583b85d
commit fe379a6067
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Overworld/time_system.asm
View File

@@ -254,17 +254,28 @@ rom_to_buff:
JSR $C692 ; $02:C692 -> rom to palette buffer for other colors JSR $C692 ; $02:C692 -> rom to palette buffer for other colors
RTL RTL
PaletteBuffer_HUD = $7EC300
PaletteBuffer_BG = $7EC340
PaletteBuffer_Spr = $7EC400
PaletteCgram_HUD = $7EC500
PaletteCgram_BG = $7EC540
PaletteCgram_Spr = $7EC600
; part of rom pal to buffer routine ; part of rom pal to buffer routine
;$1B/EF61 9F 00 C3 7E STA $7EC300,x[$7E:C422] ;$1B/EF61 9F 00 C3 7E STA $7EC300,x[$7E:C422]
;$1B/EF3D 9F 00 C3 7E STA $7EC300,x[$7E:C412] ;$1B/EF3D 9F 00 C3 7E STA $7EC300,x[$7E:C412]
;$1B/EF84 9F 00 C3 7E STA $7EC300,x[$7E:C4B2] ;$1B/EF84 9F 00 C3 7E STA $7EC300,x[$7E:C4B2]
; Palettes_LoadSingle.next_color
org $1BEF3D org $1BEF3D
JSL LoadDayNightPaletteEffect JSL LoadDayNightPaletteEffect
; Palettes_LoadMultiple.next_color
org $1BEF61 org $1BEF61
JSL LoadDayNightPaletteEffect JSL LoadDayNightPaletteEffect
; Palettes_LoadMultiple_Arbitrary.next_color
org $1BEF84 org $1BEF84
JSL LoadDayNightPaletteEffect JSL LoadDayNightPaletteEffect
@@ -274,14 +285,14 @@ LoadDayNightPaletteEffect:
STA.l !pal_color STA.l !pal_color
CPX #$0041 : BPL .title_check CPX #$0041 : BPL .title_check
STA $7EC300,X STA PaletteBuffer_HUD,X
RTL RTL
.title_check .title_check
; title or file select screen ? ; title or file select screen ?
LDA $10 : AND #$00FF : CMP #$0002 : BCS .outin_check LDA $10 : AND #$00FF : CMP #$0002 : BCS .outin_check
LDA.l !pal_color : STA $7EC300,X LDA.l !pal_color : STA PaletteBuffer_HUD,X
RTL RTL
.outin_check .outin_check
@@ -290,13 +301,13 @@ LoadDayNightPaletteEffect:
CMP.w #$0012 : BCS .restorecode CMP.w #$0012 : BCS .restorecode
BRA .overworld BRA .overworld
.restorecode .restorecode
LDA.l !pal_color : STA.l $7EC300, X LDA.l !pal_color : STA.l PaletteBuffer_HUD, X
RTL RTL
.overworld .overworld
LDA $1B : AND #$00FF : BEQ .outdoors2 LDA $1B : AND #$00FF : BEQ .outdoors2
LDA.l !pal_color LDA.l !pal_color
STA $7EC300,X STA PaletteBuffer_HUD,X
RTL RTL
.outdoors2 .outdoors2
@@ -304,7 +315,7 @@ LoadDayNightPaletteEffect:
PHX PHX
JSL ColorSubEffect JSL ColorSubEffect
PLX PLX
STA.l $7EC300,X STA.l PaletteBuffer_HUD,X
RTL RTL
} }
@@ -396,24 +407,26 @@ BackgroundFix:
JSL ColorSubEffect JSL ColorSubEffect
.no_effect: .no_effect:
STA.l $7EC500 STA.l PaletteCgram_HUD
STA.l $7EC300 STA.l PaletteBuffer_HUD
STA.l $7EC540 STA.l PaletteCgram_BG
STA.l $7EC340 STA.l PaletteBuffer_BG
rtl RTL
} }
SubAreasFix: SubAreasFix:
{ {
BEQ .no_effect
STA.l !pal_color STA.l !pal_color
PHX PHX
REP #$20 REP #$20
JSL ColorSubEffect JSL ColorSubEffect
SEP #$20 SEP #$20
PLX PLX
STA $7EC300 .no_effect
STA $7EC340 STA PaletteBuffer_HUD
rtl STA PaletteBuffer_BG
RTL
} }
GlovesFix: GlovesFix:
@@ -444,6 +457,7 @@ CheckIfNight:
LDA.b #$03 LDA.b #$03
RTL RTL
} }
}
pushpc pushpc
@@ -555,7 +569,7 @@ FixShockPalette:
PHX PHX
JSL ColorSubEffect JSL ColorSubEffect
PLX PLX
STA.l $7EC500, X STA.l PaletteCgram_HUD, X
RTL RTL
.indoors .indoors
PLA PLA