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

Time system and custom gfx cleanup

Browse Source
This commit is contained in:
scawful
2024-10-12 13:30:18 -04:00
parent f32d85ebc5
commit b0be277aeb
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Overworld/custom_gfx.asm
View File

@@ -1,4 +1,3 @@
CheckForChangeGraphicsNormalLoadBoat: CheckForChangeGraphicsNormalLoadBoat:
{ {
LDA $8A : CMP.b #$30 : BNE .boat_area LDA $8A : CMP.b #$30 : BNE .boat_area

27
Overworld/time_system.asm
View File

@@ -308,53 +308,38 @@ LoadDayNightPaletteEffect:
ColorSubEffect: ColorSubEffect:
{ {
LDA $7EE000 ; LDA #hours LDA.l Hours : AND #$00FF : CLC
AND #$00FF ADC.l Hours ; hours * 2
CLC AND #$00FF : TAX
ADC $7EE000 ; #hours * 2
AND #$00FF
TAX
.do_blue
LDA.l !pal_color : AND #$7C00 : STA !blue_value LDA.l !pal_color : AND #$7C00 : STA !blue_value
; Subtract amount to blue field based on a table SEC : SBC.l blue_table, X ; Subtract amount to blue field based on a table
SEC : SBC.l blue_table, X : STA !temp_value STA !temp_value
; mask out everything except the blue bits ; mask out everything except the blue bits
AND #$7C00 : CMP !temp_value : BEQ .no_blue_sign_change ; overflow ? AND #$7C00 : CMP !temp_value : BEQ .no_blue_sign_change ; overflow ?
.blue_sign_change
LDA #$0400 ; LDA smallest blue value LDA #$0400 ; LDA smallest blue value
.no_blue_sign_change .no_blue_sign_change
STA.l !blue_value STA.l !blue_value
do_green:
LDA !pal_color : AND #$03E0 : STA !green_value LDA !pal_color : AND #$03E0 : STA !green_value
SEC : SBC.l green_table,x ; Subtract amount to blue field based on a table SEC : SBC.l green_table,x ; Subtract amount to blue field based on a table
STA.l !temp_value STA.l !temp_value
; Mask out everything except the green bits ; Mask out everything except the green bits
AND #$03E0 : CMP !temp_value : BEQ .no_green_sign_change ; overflow ? AND #$03E0 : CMP !temp_value : BEQ .no_green_sign_change ; overflow ?
.green_sign_change
LDA #$0020 ; LDA smallest green value LDA #$0020 ; LDA smallest green value
.no_green_sign_change .no_green_sign_change
STA.l !green_value STA.l !green_value
.do_red
LDA.l !pal_color : AND #$001F : STA.l !red_value LDA.l !pal_color : AND #$001F : STA.l !red_value
SEC : SBC.l red_table,x ; substract amount to red field based on a table SEC : SBC.l red_table,x ; substract amount to red field based on a table
STA.l !temp_value STA.l !temp_value
AND #$001F ; mask out everything except the red bits AND #$001F ; mask out everything except the red bits
CMP !temp_value : BEQ .no_red_sign_change ; overflow ? CMP !temp_value : BEQ .no_red_sign_change ; overflow ?
.red_sign_change
LDA #$0001 ; LDA smallest red value LDA #$0001 ; LDA smallest red value
.no_red_sign_change .no_red_sign_change
STA.l !red_value STA.l !red_value
LDA.l !blue_value LDA.l !blue_value : ORA.l !green_value : ORA.l !red_value
ORA.l !green_value
ORA.l !red_value
RTL RTL
} }