diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 95a05ce..79331e8 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -52,9 +52,9 @@ db #$20, #$18, #$03, #$12 ; year/month/day ;$7EF41A[w] - Programmable Item #1 ;$7EF41C[w] - Programmable Item #2 ;$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 -;$7EF460 - Goal Item Counter !MS_GOT = "$7F5031" !DARK_WORLD = "$7EF3CA" diff --git a/compasses.asm b/compasses.asm index 3395802..ea6b594 100644 --- a/compasses.asm +++ b/compasses.asm @@ -1,7 +1,7 @@ ;-------------------------------------------------------------------------------- ; $7F5010 - Scratch Space (Callee Preserved) ;-------------------------------------------------------------------------------- -!GOAL_COUNTER = "$7EF460" +!GOAL_COUNTER = "$7EF418" DrawDungeonCompassCounts: LDA $1B : AND.w #$00FF : BNE + : RTL : + ; Skip if outdoors LDA $040C : CMP.w #$00FF : BNE + : RTL : + ; Skip if not in a dungeon diff --git a/goalitem.asm b/goalitem.asm index 6e6391f..e304441 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -1,7 +1,7 @@ ;-------------------------------------------------------------------------------- ; $7F5010 - Scratch Space (Callee Preserved) ;-------------------------------------------------------------------------------- -!GOAL_COUNTER = "$7EF460" +!GOAL_COUNTER = "$7EF418" !DRAW_ADDRESS = "$7EC72A" DrawGoalIndicator: LDA.l GoalItemRequirement : AND.w #$00FF : BNE + : RTL : + ; Star Meter diff --git a/newitems.asm b/newitems.asm index 1f55ff0..4add405 100755 --- a/newitems.asm +++ b/newitems.asm @@ -129,7 +129,7 @@ macro ValueShift() endmacro ;-------------------------------------------------------------------------------- !CHALLENGE_TIMER = "$7EF454" -!GOAL_COUNTER = "$7EF460" +!GOAL_COUNTER = "$7EF418" !INVENTORY_SWAP_2 = "$7EF38E" ;-------------------------------------------------------------------------------- ;carry clear if pass diff --git a/stats.asm b/stats.asm index 5a1bc2a..e3d6f09 100644 --- a/stats.asm +++ b/stats.asm @@ -1,7 +1,7 @@ ;================================================================================ ; Stat Tracking ;================================================================================ -; $7EF420 - $7EF441 - Stat Tracking +; $7EF420 - $7EF466 - Stat Tracking ;-------------------------------------------------------------------------------- ; $7EF420 - bonk counter ;--------------------------------------------------------------------------------