alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

bugfix?

Browse Source 
removed free dungeon item notices until I can figure out why they crash
This commit is contained in:
Karkat
2017-06-18 19:03:58 -04:00
parent 22bf43e81f
commit abe856f98b
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dialog.asm
View File

@@ -146,7 +146,7 @@ FreeDungeonItemNotice:
.dungeon .dungeon
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
LDA !ITEM_TEMPORARY LDA !ITEM_TEMPORARY
AND.b #$0F ; looking at high bits only AND.b #$0F ; looking at low bits only
CMP.b #$00 : BNE + ; ...light world CMP.b #$00 : BNE + ; ...light world
%CopyDialog(Notice_LightWorld) : BRL .done %CopyDialog(Notice_LightWorld) : BRL .done
+ : CMP.b #$01 : BNE + ; ...dark world + : CMP.b #$01 : BNE + ; ...dark world
@@ -191,6 +191,7 @@ FreeDungeonItemNotice:
PLB PLB
PLP PLP
PLY : PLX : PLA PLY : PLX : PLA
JSL.l Sprite_ShowMessageMinimal JSL.l Sprite_ShowMessageMinimal
RTL RTL

6
events.asm
View File

@@ -77,7 +77,11 @@ PreItemGet:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PostItemGet: PostItemGet:
;LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished ;LDA $02D8
;CMP #$70 : !BLT +
;CMP #$B0 : !BGE +
; JSL.l FreeDungeonItemNotice
;+
JSL.l MaybeWriteSRAMTrace JSL.l MaybeWriteSRAMTrace
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

5
newitems.asm
View File

@@ -231,7 +231,6 @@ AddReceivedItemExpandedGetItem:
CMP GoalItemRequirement : !BLT ++ : JSL.l StatsFinalPrep : ++ CMP GoalItemRequirement : !BLT ++ : JSL.l StatsFinalPrep : ++
BRL .done BRL .done
+ CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map + CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map
JSL.l FreeDungeonItemNotice
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $7EF368 : STA $7EF368 ; Map 1 ORA $7EF368 : STA $7EF368 ; Map 1
@@ -241,7 +240,6 @@ AddReceivedItemExpandedGetItem:
ORA $7EF369 : STA $7EF369 ; Map 2 ORA $7EF369 : STA $7EF369 ; Map 2
BRL .done BRL .done
+ CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass + CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass
JSL.l FreeDungeonItemNotice
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $7EF364 : STA $7EF364 ; Compass 1 ORA $7EF364 : STA $7EF364 ; Compass 1
@@ -251,7 +249,6 @@ AddReceivedItemExpandedGetItem:
ORA $7EF365 : STA $7EF365 ; Compass 2 ORA $7EF365 : STA $7EF365 ; Compass 2
BRL .done BRL .done
+ CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key + CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key
JSL.l FreeDungeonItemNotice
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $7EF366 : STA $7EF366 ; Big Key 1 ORA $7EF366 : STA $7EF366 ; Big Key 1
@@ -261,7 +258,6 @@ AddReceivedItemExpandedGetItem:
ORA $7EF367 : STA $7EF367 ; Big Key 2 ORA $7EF367 : STA $7EF367 ; Big Key 2
BRL .done BRL .done
+ CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key + CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key
JSL.l FreeDungeonItemNotice
AND #$0F : TAX AND #$0F : TAX
LDA $7EF37C, X : INC : STA $7EF37C, X ; Increment Key Count LDA $7EF37C, X : INC : STA $7EF37C, X ; Increment Key Count
TXA : ASL : CMP $040C : BNE ++ TXA : ASL : CMP $040C : BNE ++
@@ -276,6 +272,7 @@ RTL
; #$70 - Maps ; #$70 - Maps
; #$80 - Compasses ; #$80 - Compasses
; #$90 - Big Keys ; #$90 - Big Keys
; #$A0 - Small Keys
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!PROGRESSIVE_SHIELD = "$7EF416" ; ss-- ---- !PROGRESSIVE_SHIELD = "$7EF416" ; ss-- ----
!RNG_ITEM = "$7EF450" !RNG_ITEM = "$7EF450"