Fix max frame count

data/creditscharmapsmall_yellow.txt

@@ -29,3 +29,4 @@ Z=33
 '=35
 -=36
 .=37
+*=FF

framehook.asm

@@ -11,12 +11,19 @@ FrameHookAction:
 		LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
 		LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
 		+
-                                LDA.l GameMode : CMP.w #$010E : BNE ++ ; move this to nmi hook?
+		; move this to nmi hook?
+		LDA.l GameMode : CMP.w #$010E : BNE +
+		; item select menu
 		LDA.l MenuFrames : INC : STA.l MenuFrames : BNE ++
 		LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
+		+
+		LDA.l GameMode : CMP.w #$030E : BEQ .map ; underworld map
+		LDA.l GameMode : CMP.w #$070E : BNE ++ ; overworld map
+		.map
+		LDA.l MapFrames : INC : STA.l MapFrames : BNE ++
+		LDA.l MapFrames+2 : INC : STA.l MapFrames+2
 		++
 	REP #$30 : PLA : PLP
-
 RTL
 
 !NMI_MW = "$7F5047"

shopkeeper.asm

@@ -433,9 +433,11 @@ Shopkeeper_BuyItem:
     CMP.b #$2E : BEQ .refill ; Red Potion Refill
     CMP.b #$2F : BEQ .refill ; Green Potion Refill
     CMP.b #$30 : BEQ .refill ; Blue Potion Refill
+    CMP.b #$AF : BEQ .generic_key
     BRA +
     .refill
         JSL Sprite_GetEmptyBottleIndex : BMI .full_bottles
+    .generic_key
         LDA.b #$01 : STA.l ShopkeeperRefill ; If this is on, don't toggle bit to remove from shop
     +
 

sram.asm

@@ -309,7 +309,7 @@ HeartContainerCounter: skip 1   ; Total number of heart containers collected (in
 DeathCounter: skip 1            ; Number of deaths (integer)
 skip 1                          ; Reserved
 FluteCounter: skip 1            ; Number of times fluted (integer)
-skip 4                          ;
+MapFrames: skip 4               ; Total map time in frames (32-bit integer)
 RNGItem: skip 2                 ; RNG Item
 SwordlessBossKills: skip 1      ; Number of bosses killed without a sword (integer)
 FaerieRevivalCounter: skip 1    ; Number of faerie revivals (integer)

stats/credits.asm

@@ -513,7 +513,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("SPRITE DEVELOPMENT", "yellow")
+%smallcredits("SPRITE DEVELOPMENT", "green")
 
 %blankline()
 
@@ -534,7 +534,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("YOUR SPRITE BY", "green")
+%smallcredits("YOUR SPRITE BY", "yellow")
 
 %blankline()
 
@@ -544,7 +544,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("MSU SUPPORT", "yellow")
+%smallcredits("MSU SUPPORT", "green")
 
 %blankline()
 
@@ -553,7 +553,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("PALETTE SHUFFLER", "green")
+%smallcredits("PALETTE SHUFFLER", "yellow")
 
 %blankline()
 
@@ -562,7 +562,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("WEBSITE LOGO", "yellow")
+%smallcredits("WEBSITE LOGO", "green")
 
 %blankline()
 
@@ -755,18 +755,16 @@ endif
 
 %blankline()
 
+%bigcreditsleft("TOTAL MAP TIME")
+
+%blankline()
+
 %bigcreditsleft("TOTAL LAG TIME")
 
 %blankline()
 
 %bigcreditsleft("SHIELDS EATEN")
 
-%blankline()
-
-
-%blankline()
-%blankline()
-
 
 %blankline()
 %blankline()

stats/fonttable.asm

@@ -265,4 +265,6 @@ dw $3D99 ; -               ; $FB
 dw $0000 ;                 ;
 dw $0000 ;                 ;
 dw $0000 ;                 ;
-dw $0000 ;                 ;
+
+; yellow dot
+dw $2DFA ;                 ; FF

stats/main.asm

@@ -174,7 +174,7 @@ FindLine:
 !FRAMES_PER_SECOND = 60
 !FRAMES_PER_MINUTE = 60*60
 !FRAMES_PER_HOUR = 60*60*60
-!MAX_FRAME_COUNT = 59*60+59*60+59*60+99
+!MAX_FRAME_COUNT = (99*60*60*60)+(59*60*60)+(59*60)+59
 
 macro CountUnits(framesPerUnit, unitCounter)
 	STZ.b <unitCounter>
@@ -196,7 +196,7 @@ endmacro
 
 !ColonOffset = $8A
 !PeriodOffset = $4D
-BlankCreditsTile = $883D
+BlankCreditsTile = $3D88
 
 RenderCreditsStatCounter:
 	PHB
@@ -591,7 +591,7 @@ EndingSequenceTableLookupOverride:
 	PHK : PLB
 	TYX
 	LDA.l EndingSequenceText, X : AND.w #$00FF
-        ASL
+	ASL A
 	TAY
 	LDA.w FontTable,Y
 	PLB : PLX

stats/statConfig.asm

@@ -30,10 +30,12 @@
 !FAERIE_REVIVALS_Y = 361
 !TOTAL_MENU_TIME_X = 19
 !TOTAL_MENU_TIME_Y = 364
+!TOTAL_MAP_TIME_X = 19
+!TOTAL_MAP_TIME_Y = 367
 !TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 367
+!TOTAL_LAG_TIME_Y = 370
 !PIKIT_FED_X = 26
-!PIKIT_FED_Y = 370
+!PIKIT_FED_Y = 373
 !COLLECTION_RATE_X = 22
 !COLLECTION_RATE_Y = 380
 !TOTAL_TIME_X = 19
@@ -64,11 +66,11 @@ CreditsStats:
 %AddStat(SaveQuitCounter, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat(DeathCounter, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
 %AddStat(FaerieRevivalCounter, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)
-%AddStat(MenuFrames, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
+%AddStat(MenuFrames, 1, 0, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
+%AddStat(MapFrames, 1, 0, 32, 4, !TOTAL_MAP_TIME_X, !TOTAL_MAP_TIME_Y)
 %AddStat(LagTime, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
 %AddStat(PikitFed, 0, 0, 8, 3, !PIKIT_FED_X, !PIKIT_FED_Y)
 print "Collection Rate config: ", pc
-; warnpc $A39864
 %AddStat(TotalItemCounter, 0, 0, 16, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat(NMIFrames, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)