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

Add TingleId SRAM, various housekeeping

Browse Source
This commit is contained in:
scawful
2024-12-09 19:12:45 -05:00
parent aa220eb9c4
commit e794152520
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/symbols.asm
View File

@@ -112,6 +112,7 @@ Honeycomb = $7EF393
DekuSticks = $7EF395 DekuSticks = $7EF395
TingleMaps = $7EF396 TingleMaps = $7EF396
TingleId = $7EF397
; .dgi zktm ; .dgi zktm
; m - Mushroom Grotto ; m - Mushroom Grotto

11
Items/ice_rod.asm
View File

@@ -52,10 +52,7 @@ LinkItem_IceRod:
; calculation procedure to get correct x,y coordinates for new tile ; calculation procedure to get correct x,y coordinates for new tile
LDA $00 : SEC : SBC $0708 : AND $070A LDA $00 : SEC : SBC $0708 : AND $070A
ASL A ASL A : ASL A : ASL A : STA $06
ASL A
ASL A
STA $06
LDA $02 : SEC : SBC $070C : AND $070E : ORA $06 LDA $02 : SEC : SBC $070C : AND $070E : ORA $06
TAX TAX
LDA #$00B7 : STA $7E2000, X ; store new 16x16 ice tile into ram (property of tile!) LDA #$00B7 : STA $7E2000, X ; store new 16x16 ice tile into ram (property of tile!)
@@ -68,10 +65,7 @@ LinkItem_IceRod:
LDA $02 : ADC #$07FF : STA $02 LDA $02 : ADC #$07FF : STA $02
TXA TXA
AND #$001F : ADC $02 : STA $02 AND #$001F : ADC $02 : STA $02
TXA TXA : AND #$0780 : LSR A : ADC $02
AND #$0780
LSR A
ADC $02
STA $2116 ; store vram address for upper tile part (8x16) to $2116 STA $2116 ; store vram address for upper tile part (8x16) to $2116
STA $7ED007 STA $7ED007
@@ -112,6 +106,7 @@ VramDmaTransfer:
} }
; bug fix to not swim through tiles but jump onto them ; bug fix to not swim through tiles but jump onto them
; TileBehavior_GanonIce
org $07DC9E org $07DC9E
JSL $0EFC80 JSL $0EFC80
NOP NOP