diff --git a/Core/message.asm b/Core/message.asm index ef60d63..6aea492 100644 --- a/Core/message.asm +++ b/Core/message.asm @@ -45,7 +45,7 @@ MessageExpandedData: Message_18D: db $13, $B4, $20, $25, $1E, $42, $59, $13, $B4, $20, $25, $1E, $42, $59, $0A, $28, $28, $BB, $40, $0B, $22, $26, $29, $1A, $21, $3E, $75, $00, $21, $42, $59, $E3, $59, $2D, $21, $A6, $1E, $3E, $76, $03, $28, $59, $E3, $59, $D0, $1E, $24, $59, $BD, $29, $2C, $42, $59, $26, $32, $59, $1F, $2B, $22, $A5, $1D, $3F, $7E, $73, $13, $B4, $20, $25, $1E, $59, $AE, $59, $DB, $1A, $2F, $1E, $25, $A4, $1F, $1A, $2B, $59, $90, $73, $E2, $1D, $1E, $59, $1A, $1C, $2B, $28, $2C, $2C, $59, $0A, $1A, $25, $32, $31, $28, $59, $DA, $59, $1C, $B1, $2B, $2D, $73, $D8, $59, $2E, $27, $B8, $27, $3E, $59, $05, $C8, $59, $1A, $59, $2C, $26, $8E, $1F, $1E, $1E, $42, $7E, $73, $C6, $59, $1C, $28, $2E, $2B, $D0, $43, $73, $88, $44, $59, $16, $21, $91, $9F, $59, $E3, $59, $AD, $3F, $73, $88, $89, $08, $51, $26, $59, $28, $24, $1A, $32, $41, $68, $7F Message_18E: -db $00, $21, $42, $59, $1A, $59, $30, $B5, $1E, $59, $1C, $21, $28, $22, $1C, $1E, $3E, $75, $16, $B6, $21, $59, $2D, $B0, $2C, $59, $BD, $29, $42, $59, $27, $28, $59, $D0, $1C, $CE, $2D, $76, $E2, $25, $25, $59, $97, $59, $B0, $1D, $1D, $A0, $A9, $26, $59, $E3, $3E, $7E, $73, $09, $2E, $D3, $59, $21, $8C, $28, $2F, $A1, $D8, $59, $2B, $DC, $1E, $1E, $2C, $73, $8C, $25, $1E, $2D, $59, $D8, $59, $1A, $1D, $2F, $A3, $2E, $CD, $97, $20, $B4, $3E, $7F +db $00, $21, $42, $59, $1A, $59, $30, $B5, $1E, $59, $1C, $21, $28, $22, $1C, $1E, $3E, $75, $16, $B6, $21, $59, $2D, $B0, $2C, $59, $BD, $29, $42, $59, $27, $28, $59, $D0, $1C, $CE, $2D, $76, $E2, $25, $25, $59, $97, $59, $B0, $1D, $1D, $A0, $A9, $26, $59, $E3, $3E, $7E, $73, $09, $2E, $D3, $59, $21, $8C, $28, $2F, $A1, $D8, $59, $2B, $DC, $1E, $1E, $2C, $73, $8C, $25, $1E, $2D, $59, $D8, $59, $1A, $1D, $2F, $A3, $2E, $CD, $97, $20, $B4, $3E, $7F Message_18F: db $0E, $21, $59, $1D, $A2, $41, $41, $41, $75, $08, $2D, $59, $D0, $1E, $26, $2C, $59, $E3, $2B, $59, $29, $28, $9C, $1E, $2D, $2C, $59, $8D, $1A, $76, $1A, $59, $1B, $B6, $59, $25, $22, $20, $21, $2D, $41, $59, $02, $28, $BE, $59, $96, $9C, $59, $E1, $A5, $7E, $73, $E3, $2B, $59, $DF, $25, $25, $1E, $2D, $59, $B5, $59, $1A, $2C, $59, $1F, $2E, $25, $25, $59, $1A, $2C, $59, $26, $B4, $1E, $3E, $73, $13, $B4, $20, $25, $1E, $59, $E2, $25, $25, $59, $DF, $B6, $42, $59, $9F, $27, $51, $2D, $73, $E3, $59, $30, $C8, $2B, $32, $3E, $7F Message_190: diff --git a/Core/symbols.asm b/Core/symbols.asm index 9c58b91..b8a9aa5 100644 --- a/Core/symbols.asm +++ b/Core/symbols.asm @@ -112,6 +112,7 @@ Honeycomb = $7EF393 DekuSticks = $7EF395 TingleMaps = $7EF396 +TingleId = $7EF397 ; .dgi zktm ; m - Mushroom Grotto diff --git a/Items/ice_rod.asm b/Items/ice_rod.asm index 6870940..0038f67 100644 --- a/Items/ice_rod.asm +++ b/Items/ice_rod.asm @@ -52,26 +52,20 @@ LinkItem_IceRod: ; calculation procedure to get correct x,y coordinates for new tile LDA $00 : SEC : SBC $0708 : AND $070A - ASL A - ASL A - ASL A - STA $06 + ASL A : ASL A : ASL A : STA $06 LDA $02 : SEC : SBC $070C : AND $070E : ORA $06 TAX LDA #$00B7 : STA $7E2000, X ; store new 16x16 ice tile into ram (property of tile!) CLC : STZ $02 ; calculation procedure to get 8x8 vram map address (look of tile) TXA AND #$003F : CMP #$0020 : BCC $05 - LDA #$0400 : STA $02 + LDA #$0400 : STA $02 TXA AND #$0FFF : CMP #$0800 : BCC $07 - LDA $02 : ADC #$07FF : STA $02 + LDA $02 : ADC #$07FF : STA $02 TXA AND #$001F : ADC $02 : STA $02 - TXA - AND #$0780 - LSR A - ADC $02 + TXA : AND #$0780 : LSR A : ADC $02 STA $2116 ; store vram address for upper tile part (8x16) to $2116 STA $7ED007 @@ -112,6 +106,7 @@ VramDmaTransfer: } ; bug fix to not swim through tiles but jump onto them +; TileBehavior_GanonIce org $07DC9E JSL $0EFC80 NOP