alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow non-rando item recive messages to potentially be disabled

Browse Source
This commit is contained in:
Kevin Cathcart
2018-07-15 15:58:46 -04:00
parent 4c59eeb86b
commit 1f4b4ab5fb
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dialog.asm
View File

@@ -255,6 +255,18 @@ DialogResetSelectionIndex:
STZ $1CE8 STZ $1CE8
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DialogItemReceive:
BCS .noMessage ; if doubling the item value overflowed it must be a rando item
CPY #$98 : !BLT + ;if the item is $4C or greater it must be a rando item
.noMessage
LDA.w #$FFFF
BRA .done
+
LDA Ancilla_ReceiveItem_item_messages, Y
.done
CMP.w #$FFFF
RTL
;--------------------------------------------------------------------------------
DialogFairyThrow: DialogFairyThrow:
LDA.l Restrict_Ponds : BEQ .normal LDA.l Restrict_Ponds : BEQ .normal
LDA $7EF35C : ORA $7EF35D : ORA $7EF35E : ORA $7EF35F : BNE .normal LDA $7EF35C : ORA $7EF35D : ORA $7EF35E : ORA $7EF35F : BNE .normal

5
hooks.asm
View File

@@ -1499,9 +1499,10 @@ org $08C3FD ; <- 443FD - ancilla_receive_item.asm : 89
LDA #$40 : STA !MS_GOT LDA #$40 : STA !MS_GOT
;;NOP #6 ; don't set master sword follower ;;NOP #6 ; don't set master sword follower
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-- Disable all vanilla items (since item message table does not include rando items)
org $08C5E5 ; <- 445ED - ancilla_receive_item.asm:395 (LDA .item_messages, Y : CMP.w #$FFFF : BEQ .handleGraphics) org $08C5E5 ; <- 445ED - ancilla_receive_item.asm:395 (LDA .item_messages, Y : CMP.w #$FFFF : BEQ .handleGraphics)
LDA.w #$FFFF JSL.l DialogItemReceive : NOP #2
org $08C301 ; <- 44301 - ancilla_receive_item.asm:8 (.item_messages)
Ancilla_ReceiveItem_item_messages:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-- Reset Dialog Selection index for each new message ;-- Reset Dialog Selection index for each new message
org $0EEE5D ; <- 76E5D - vwf.asm:84 (JSL Attract_DecompressStoryGfx) org $0EEE5D ; <- 76E5D - vwf.asm:84 (JSL Attract_DecompressStoryGfx)