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

flute pickup / goal item stats clash

Browse Source
This commit is contained in:
Karkat
2018-03-16 15:05:27 -04:00
parent a2818e479e
commit 8f35ab8cb4
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LTTP_RND_GeneralBugfixes.asm
View File

@@ -52,9 +52,9 @@ db #$20, #$18, #$03, #$12 ; year/month/day
;$7EF41A[w] - Programmable Item #1 ;$7EF41A[w] - Programmable Item #1
;$7EF41C[w] - Programmable Item #2 ;$7EF41C[w] - Programmable Item #2
;$7EF41E[w] - Programmable Item #3 ;$7EF41E[w] - Programmable Item #3
;$7EF420 - $7EF44F - Stat Tracking Bank 1 ;$7EF418 - Goal Item Counter
;$7EF420 - $7EF466 - Stat Tracking Bank 1
;$7EF450 - $7EF45F - RNG Item (Single) Flags ;$7EF450 - $7EF45F - RNG Item (Single) Flags
;$7EF460 - Goal Item Counter
!MS_GOT = "$7F5031" !MS_GOT = "$7F5031"
!DARK_WORLD = "$7EF3CA" !DARK_WORLD = "$7EF3CA"

2
compasses.asm
View File

@@ -1,7 +1,7 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7F5010 - Scratch Space (Callee Preserved) ; $7F5010 - Scratch Space (Callee Preserved)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!GOAL_COUNTER = "$7EF460" !GOAL_COUNTER = "$7EF418"
DrawDungeonCompassCounts: DrawDungeonCompassCounts:
LDA $1B : AND.w #$00FF : BNE + : RTL : + ; Skip if outdoors LDA $1B : AND.w #$00FF : BNE + : RTL : + ; Skip if outdoors
LDA $040C : CMP.w #$00FF : BNE + : RTL : + ; Skip if not in a dungeon LDA $040C : CMP.w #$00FF : BNE + : RTL : + ; Skip if not in a dungeon

2
goalitem.asm
View File

@@ -1,7 +1,7 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7F5010 - Scratch Space (Callee Preserved) ; $7F5010 - Scratch Space (Callee Preserved)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!GOAL_COUNTER = "$7EF460" !GOAL_COUNTER = "$7EF418"
!DRAW_ADDRESS = "$7EC72A" !DRAW_ADDRESS = "$7EC72A"
DrawGoalIndicator: DrawGoalIndicator:
LDA.l GoalItemRequirement : AND.w #$00FF : BNE + : RTL : + ; Star Meter LDA.l GoalItemRequirement : AND.w #$00FF : BNE + : RTL : + ; Star Meter

2
newitems.asm
View File

@@ -129,7 +129,7 @@ macro ValueShift()
endmacro endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!CHALLENGE_TIMER = "$7EF454" !CHALLENGE_TIMER = "$7EF454"
!GOAL_COUNTER = "$7EF460" !GOAL_COUNTER = "$7EF418"
!INVENTORY_SWAP_2 = "$7EF38E" !INVENTORY_SWAP_2 = "$7EF38E"
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;carry clear if pass ;carry clear if pass

2
stats.asm
View File

@@ -1,7 +1,7 @@
;================================================================================ ;================================================================================
; Stat Tracking ; Stat Tracking
;================================================================================ ;================================================================================
; $7EF420 - $7EF441 - Stat Tracking ; $7EF420 - $7EF466 - Stat Tracking
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF420 - bonk counter ; $7EF420 - bonk counter
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------