Fix free item text to work

if enabled
This commit is contained in:
sporchia
2017-09-30 09:54:18 -04:00
parent 51c926a063
commit 0ec028a36f
3 changed files with 10 additions and 7 deletions

View File

@@ -152,7 +152,9 @@ FreeDungeonItemNotice:
+ : CMP.b #$A0 : BNE + ; small key of... + : CMP.b #$A0 : BNE + ; small key of...
%CopyDialog(Notice_SmallKeyOf) %CopyDialog(Notice_SmallKeyOf)
PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA
BRA .dungeon
+ +
BRL .skip ; it's not something we are going to give a notice for
.dungeon .dungeon
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
@@ -194,6 +196,7 @@ FreeDungeonItemNotice:
.done .done
LDA.b #$01 : STA $7F5035 ; set alternate dialog flag LDA.b #$01 : STA $7F5035 ; set alternate dialog flag
LDA.b #$01 : STA $7F50A0
;-------------------------------- ;--------------------------------
PLA : STA $02 PLA : STA $02
@@ -202,8 +205,7 @@ FreeDungeonItemNotice:
PLB PLB
PLP PLP
PLY : PLX : PLA PLY : PLX : PLA
;JSL.l Main_ShowTextMessage
JSL.l Main_ShowTextMessage
RTL RTL
.skip .skip

View File

@@ -93,10 +93,10 @@ RTL
PostItemAnimation: PostItemAnimation:
LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished
;LDA $7F50A0 : BEQ + LDA $7F50A0 : BEQ +
; JSL.l Main_ShowTextMessage JSL.l Main_ShowTextMessage
; LDA.b #$00 : STA $7F50A0 LDA.b #$00 : STA $7F50A0
;+ +
STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
RTL RTL

View File

@@ -174,6 +174,7 @@ AddReceivedItemExpandedGetItem:
;++ ;++
LDA $02D8 ; check inventory LDA $02D8 ; check inventory
JSL.l FreeDungeonItemNotice
CMP.b #$4C : BNE + ; 50 bombs CMP.b #$4C : BNE + ; 50 bombs
;LDA.b #$07 : STA $7EF370 ; upgrade bombs ;LDA.b #$07 : STA $7EF370 ; upgrade bombs
LDA.b #50 : !SUB.l StartingMaxBombs : STA $7EF370 ; upgrade bombs LDA.b #50 : !SUB.l StartingMaxBombs : STA $7EF370 ; upgrade bombs