Merge branch 'main' into kara

stats/statConfig.asm

@@ -1,4 +1,50 @@
-;(address, type, shiftRight, bits, digits, xPos, lineNumber)
+!FIRST_SWORD_X = 19
+!FIRST_SWORD_Y = 310
+!PEGASUS_BOOTS_X = 19
+!PEGASUS_BOOTS_Y = 313
+!FLUTE_X = 19
+!FLUTE_Y = 316
+!MIRROR_X = 19
+!MIRROR_Y = 319
+!SWORDLESS_X = 23
+!SWORDLESS_Y = 327
+!FIGHTERS_SWORD_X = 23
+!FIGHTERS_SWORD_Y = 330
+!MASTER_SWORD_X = 23
+!MASTER_SWORD_Y = 333
+!TEMPERED_SWORD_X = 23
+!TEMPERED_SWORD_Y = 336
+!GOLD_SWORD_X = 23
+!GOLD_SWORD_Y = 339
+!DAMAGETAKEN_X = 26
+!DAMAGETAKEN_Y = 346
+!MAGICUSED_X = 26
+!MAGICUSED_Y = 349
+!BONKS_X = 26
+!BONKS_Y = 352
+!SAVE_AND_QUITS_X = 26
+!SAVE_AND_QUITS_Y = 355
+!DEATHS_X = 26
+!DEATHS_Y = 358
+!FAERIE_REVIVALS_X = 26
+!FAERIE_REVIVALS_Y = 361
+!TOTAL_MENU_TIME_X = 19
+!TOTAL_MENU_TIME_Y = 364
+!TOTAL_LAG_TIME_X = 19
+!TOTAL_LAG_TIME_Y = 367
+!COLLECTION_RATE_X = 22
+!COLLECTION_RATE_Y = 380
+!TOTAL_TIME_X = 19
+!TOTAL_TIME_Y = 383
+
+macro AddStat(address, type, shiftRight, bits, digits, xPos, lineNumber)
+    db <xPos><<2|<type><<9|<lineNumber>>>8
+    db <lineNumber>
+    db <bits><<4|<shiftRight>
+    db <digits><<5
+    db $00
+    dl <address>
+endmacro
 
 %AddStat(SwordTime, 1, 0, 32, 4, !FIRST_SWORD_X, !FIRST_SWORD_Y)
 %AddStat(BootsTime, 1, 0, 32, 4, !PEGASUS_BOOTS_X, !PEGASUS_BOOTS_Y)
@@ -17,6 +63,6 @@
 %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($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
+%AddStat(LagTime, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
 %AddStat(TotalItemCounter, 0, 0, 16, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat(NMIFrames, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)