From 23041f7b092269dd652a7091cf0f03cb522dbe6e Mon Sep 17 00:00:00 2001 From: Karkat Date: Sat, 6 Jan 2018 22:07:14 -0500 Subject: [PATCH] stuff --- inventory.asm | 36 ++++++++++++++++++++++++++++++++++++ stats.asm | 16 ++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/inventory.asm b/inventory.asm index 677bdc1..47c737a 100644 --- a/inventory.asm +++ b/inventory.asm @@ -461,6 +461,7 @@ AddInventory: JSR .incrementY BRL .done + CPY.b #$4B : BNE + ; Pegasus Boots + JSR .stampBoots JSR .incrementA BRL .done + CPY.b #$4C : BNE + ; Bomb Capacity Upgrade @@ -516,6 +517,41 @@ RTL ; WHICH BEE IS BOTTLED? ; MAKE SURE FAIRY FOUNTAINS DON'T FUCK THE COUNTS UP +!NMI_TIME = "$7EF43E" + +!SWORD_TIME = "$7EF458" +!BOOTS_TIME = "$7EF45C" +!FLUTE_TIME = "$7EF460" +!MIRROR_TIME = "$7EF464" + +.stampSword + REP $20 ; set 16-bit accumulator + LDA !NMI_TIME : STA !SWORD_TIME + LDA !NMI_TIME+2 : STA !SWORD_TIME+2 + REP $20 ; set 8-bit accumulator +RTS + +.stampBoots + REP $20 ; set 16-bit accumulator + LDA !NMI_TIME : STA !BOOTS_TIME + LDA !NMI_TIME+2 : STA !BOOTS_TIME+2 + REP $20 ; set 8-bit accumulator +RTS + +.stampFlute + REP $20 ; set 16-bit accumulator + LDA !NMI_TIME : STA !FLUTE_TIME + LDA !NMI_TIME+2 : STA !FLUTE_TIME+2 + REP $20 ; set 8-bit accumulator +RTS + +.stampMirror + REP $20 ; set 16-bit accumulator + LDA !NMI_TIME : STA !MIRROR_TIME + LDA !NMI_TIME+2 : STA !MIRROR_TIME+2 + REP $20 ; set 8-bit accumulator +RTS + .incrementSword ; CHECK FOR DUPLICATE SWORDS TYA ; load sword item diff --git a/stats.asm b/stats.asm index 6e0cd8c..d359700 100644 --- a/stats.asm +++ b/stats.asm @@ -121,6 +121,22 @@ ;-------------------------------------------------------------------------------- ; $7EF456w[2] - challenge timer (high) ;-------------------------------------------------------------------------------- +; $7EF458w[2] - sword timestamp (low) +;-------------------------------------------------------------------------------- +; $7EF45Aw[2] - sword timestamp (high) +;-------------------------------------------------------------------------------- +; $7EF45Cw[2] - boots timestamp (low) +;-------------------------------------------------------------------------------- +; $7EF45Ew[2] - boots timestamp (high) +;-------------------------------------------------------------------------------- +; $7EF460w[2] - flute timestamp (low) +;-------------------------------------------------------------------------------- +; $7EF462w[2] - flute timestamp (high) +;-------------------------------------------------------------------------------- +; $7EF464w[2] - mirror timestamp (low) +;-------------------------------------------------------------------------------- +; $7EF466w[2] - mirror timestamp (high) +;-------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------- !LOCK_STATS = "$7EF443"