Skip to content

Commit

Permalink
Move stats that were not compass related out of the former compass co…
Browse files Browse the repository at this point in the history
…unters.
  • Loading branch information
CaitSith2 committed Feb 10, 2021
1 parent 33a9e66 commit a83315e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions inventory.asm
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ AddInventory:

LDA $7EF353 : BNE + ; Check for Mirror
REP #$20
LDA $7EF434 : INC : STA $7EF434 ; Increment Pre Mirror Counter
LDA $7EF468 : INC : STA $7EF468 ; Increment Pre Mirror Counter
SEP #$20
+
REP #$20
Expand Down Expand Up @@ -662,7 +662,7 @@ RTS
RTS

.incrementMail
LDA $7EF436 : !ADD #$40 : STA $7EF436
LDA $7EF46A : !ADD #$40 : STA $7EF46A
RTS

.incrementKeyLong
Expand All @@ -671,9 +671,9 @@ RTL

.incrementKey
PHA : PHX
LDA $7EF436 : INC : AND #$3F : TAX
LDA $7EF436 : AND #$C0 : STA $7EF436
TXA : ORA $7EF436 : STA $7EF436
LDA $7EF46A : INC : AND #$3F : TAX
LDA $7EF46A : AND #$C0 : STA $7EF46A
TXA : ORA $7EF46A : STA $7EF46A
PLX : PLA
RTS

Expand Down
18 changes: 9 additions & 9 deletions stats.asm
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,9 @@
;--------------------------------------------------------------------------------
; $7EF430w[2] - loop frame counter (high)
;--------------------------------------------------------------------------------
; $7EF432 - locations before boots
; $7EF432w[2] - locations before boots
;--------------------------------------------------------------------------------
; $7EF434 - locations before mirror
;--------------------------------------------------------------------------------
; $7EF436 mmkkkkkk
; m - mail counter
; k - small keys
;--------------------------------------------------------------------------------
; $7EF437-7EF439 - free space
; $7EF434-7EF439 - FORMER COMPASS COUNTERS. DO NOT REUSE.
;--------------------------------------------------------------------------------
; $7EF43A - times mirrored outdoors
;--------------------------------------------------------------------------------
Expand Down Expand Up @@ -114,6 +108,12 @@
;--------------------------------------------------------------------------------
; $7EF466w[2] - mirror timestamp (high)
;--------------------------------------------------------------------------------
; $7EF468w[2] - locations before mirror
;--------------------------------------------------------------------------------
; $7EF46A mmkkkkkk
; m - mail counter
; k - small keys
;--------------------------------------------------------------------------------
; $7EF4C0 - 7EF4CF - locations checked, indexed by 040C >> 1
;--------------------------------------------------------------------------------

Expand Down Expand Up @@ -388,7 +388,7 @@ IndoorSubtileTransitionCounter:
JMP StatTransitionCounter
;--------------------------------------------------------------------------------
!CHEST_COUNTER = "$7EF442"
!MAIL_COUNTER = "$7EF436" ; mmkkkkkk
!MAIL_COUNTER = "$7EF46A" ; mmkkkkkk
!BOSS_KILLS = "$7F5037"
!SWORD_KILLS_1 = "$7EF425"
!SWORD_KILLS_2 = "$7EF426"
Expand Down

0 comments on commit a83315e

Please sign in to comment.