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

Cleanup Asar warnings with deprecated #$ format in tables

Browse Source
This commit is contained in:
scawful
2024-09-29 22:01:34 -04:00
parent 76d08711f0
commit 42ce2c4ee2
9 changed files with 153 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Masks/gbc_form.asm
View File

@@ -1,6 +1,6 @@
; ========================================
; =========================================================
; GBC Link
; ========================================
; =========================================================
UpdateGbcPalette:
{
@@ -13,46 +13,38 @@ UpdateGbcPalette:
.loop
LDA.l GameboyLinkPalette, X : STA $7EC6E0, X
DEX : DEX : BPL .loop
SEP #$30 ; go back to 8 bit mode
INC $15 ; update the palette
RTL ; or RTS depending on where you need it
.blue_mail
.blue_mail
LDX #$001E
.loop2
LDA.l GameboyLinkBlueMail, X : STA $7EC6E0, X
DEX : DEX : BPL .loop2
.loop2
LDA.l GameboyLinkBlueMail, X : STA $7EC6E0, X
DEX : DEX : BPL .loop2
SEP #$30 ; go back to 8 bit mode
INC $15 ; update the palette
RTL ; or RTS depending on where you need it
.red_mail
.red_mail
LDX #$001E
.loop3
LDA.l GameboyLinkRedMail, X : STA $7EC6E0, X
DEX : DEX : BPL .loop3
.loop3
LDA.l GameboyLinkRedMail, X : STA $7EC6E0, X
DEX : DEX : BPL .loop3
SEP #$30 ; go back to 8 bit mode
INC $15 ; update the palette
RTL ; or RTS depending on where you need it
}
GameboyLinkPalette:
{
dw #$0000, #$7FFF, #$237E, #$B711, #$369E, #$14A5, #$01FF, #$1078
dw #$46FF, #$22A2, #$3B68, #$0A4A, #$12EF, #$2A5C, #$1571, #$7A18
}
dw $0000, $7FFF, $237E, $B711, $369E, $14A5, $01FF, $1078
dw $46FF, $22A2, $3B68, $0A4A, $12EF, $2A5C, $1571, $7A18
GameboyLinkBlueMail:
{
dw #$0000, #$7FFF, #$237E, #$B711, #$369E, #$14A5, #$01FF, #$1078
dw #$46FF, #$4D25, #$3B68, #$0A4A, #$12EF, #$2A5C, #$1571, #$7A18
}
dw $0000, $7FFF, $237E, $B711, $369E, $14A5, $01FF, $1078
dw $46FF, $4D25, $3B68, $0A4A, $12EF, $2A5C, $1571, $7A18
GameboyLinkRedMail:
{
dw #$0000, #$7FFF, #$237E, #$B711, #$369E, #$14A5, #$01FF, #$1078
dw #$46FF, #$081D, #$3B68, #$0A4A, #$12EF, #$2A5C, #$1571, #$7A18
}
dw $0000, $7FFF, $237E, $B711, $369E, $14A5, $01FF, $1078
dw $46FF, $081D, $3B68, $0A4A, $12EF, $2A5C, $1571, $7A18
LinkState_GameboyInDungeonEntrance:
{
@@ -60,12 +52,9 @@ LinkState_GameboyInDungeonEntrance:
LDA $0FFF : CMP #$00 : BEQ .return
LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
LDA $BC : CMP #$06 : BEQ .return
JSL UpdateGbcPalette
LDA #$3B : STA $BC ; change link's sprite
.return
LDA #$3B : STA $BC ; change link's sprite
.return
JSL $0AFE80 ; Underworld_HandleLayerEffect
RTL
}
@@ -76,13 +65,11 @@ LoadOverworld_CheckForGbcLink:
LDA $0FFF : BEQ .return_lw
LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
LDA.b #$06 : STA $02B2
LDA.b #$3B : STA $BC ; change link's sprite
LDA.b #$3B : STA $BC ; change link's sprite
JSL UpdateGbcPalette
JMP .return
.return_lw
STZ.w $02B2
.return
JSL Palette_ArmorAndGloves
STZ.b $B0
@@ -92,7 +79,7 @@ LoadOverworld_CheckForGbcLink:
OverworldTransition_CheckForGbcLink:
{
LDA $0FFF : BEQ .return
LDA $0FFF : BEQ .return
LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
LDA #$3B : STA $BC ; change link's sprite
LDA #$06 : STA $02B2
@@ -124,8 +111,7 @@ LinkState_GameboyForm:
LDA $0FFF : BEQ .return ; not in dark world
.transform
%PlayerTransform()
LDA #$3B : STA $BC ; change link's sprite
LDA #$3B : STA $BC ; change link's sprite
LDA #$06 : STA $02B2
JSL UpdateGbcPalette
BRA .return
@@ -135,9 +121,8 @@ LinkState_GameboyForm:
LDA #$10 : STA $BC
STZ $02B2
JSL Palette_ArmorAndGloves
.return
JSL $07F1E6
JSL $07F1E6
RTL
}
pushpc
pushpc