diff --git a/NTSC-J 1.0/AttemptCounter.customized.txt b/NTSC-J 1.0/AttemptCounter.customized.txt index 68a3b35..97b695d 100644 --- a/NTSC-J 1.0/AttemptCounter.customized.txt +++ b/NTSC-J 1.0/AttemptCounter.customized.txt @@ -9,30 +9,31 @@ by setting the format to 1 or something else -$ AttemptCounter (2022/11/02) [sup39] +$ AttemptCounter (v0.2, 2022/11/02) [sup39] 0410C3C8 496EDB45 -040EDB34 4970C419 -04206898 495F36D4 -077F9F0C 000000B0 +040EDB34 4970C41D +04206898 495F36D8 +077F9F0C 000000B4 7C7E1B78 3D808180 A40C9F08 A17E007C 7C005800 B16C0000 3960003C B16C0002 -39600001 4082000C -816CFFFC 396B0001 -916CFFFC 39600000 -916CFFF8 4E800020 -3D808180 856C9F00 -396B0001 916C0000 -3960003C B16C000A -39000000 4E800020 -4A83B2BD 3D808180 -A46C9F0A 3463FFFF -4180003C B06C0000 -3860xxxx 3880yyyy -38A0ssss 3CC0rrgg -60C6FFFF 7CC73378 -4800000D 25640A25 -64000000 7D0802A6 -812CFFF6 814CFFFA -4BFF6285 4AA0C8E4 +39600001 39400000 +40820010 816CFFFC +396B0001 814CFFF8 +916CFFFC 914CFFF8 +4E800020 3D808180 +856C9F00 396B0001 +916C0000 3960003C +B16C000A 39000000 +4E800020 4A83B2B9 +3D808180 A46C9F0A +3463FFFF 4180003C +B06C0000 3860xxxx +3880yyyy 38A0ssss +3CC0rrgg 60C6bbaa +7CC73378 4800000D +25640A25 64000000 +7D0802A6 812CFFF6 +814CFFFA 4BFF6281 +4AA0C8E0 00000000 diff --git a/NTSC-J 1.0/AttemptCounter.txt b/NTSC-J 1.0/AttemptCounter.txt index ff1ae38..1365fa4 100644 --- a/NTSC-J 1.0/AttemptCounter.txt +++ b/NTSC-J 1.0/AttemptCounter.txt @@ -1,27 +1,28 @@ -$ AttemptCounter (2022/11/02) [sup39] +$ AttemptCounter (v0.2, 2022/11/02) [sup39] 0410C3C8 496EDB45 -040EDB34 4970C419 -04206898 495F36D4 -077F9F0C 000000B0 +040EDB34 4970C41D +04206898 495F36D8 +077F9F0C 000000B4 7C7E1B78 3D808180 A40C9F08 A17E007C 7C005800 B16C0000 3960003C B16C0002 -39600001 4082000C -816CFFFC 396B0001 -916CFFFC 39600000 -916CFFF8 4E800020 -3D808180 856C9F00 -396B0001 916C0000 -3960003C B16C000A -39000000 4E800020 -4A83B2BD 3D808180 -A46C9F0A 3463FFFF -4180003C B06C0000 -38600090 3880007C -38A0001C 3CC0FFFF -60C6FFFF 7CC73378 -4800000D 25640A25 -64000000 7D0802A6 -812CFFF6 814CFFFA -4BFF6285 4AA0C8E4 +39600001 39400000 +40820010 816CFFFC +396B0001 814CFFF8 +916CFFFC 914CFFF8 +4E800020 3D808180 +856C9F00 396B0001 +916C0000 3960003C +B16C000A 39000000 +4E800020 4A83B2B9 +3D808180 A46C9F0A +3463FFFF 4180003C +B06C0000 38600090 +3880007C 38A0001C +3CC0FFFF 60C6FFFF +7CC73378 4800000D +25640A25 64000000 +7D0802A6 812CFFF6 +814CFFFA 4BFF6281 +4AA0C8E0 00000000 diff --git a/src/AttemptCounter.s b/src/AttemptCounter.s index 81cf0a6..233b9d3 100644 --- a/src/AttemptCounter.s +++ b/src/AttemptCounter.s @@ -3,7 +3,7 @@ .set x, 144 .set y, 124 .set fontSize, 28 -.set color, 0xffffffff +.set color, 0x99ffffff .set freezeDuration, 60 .set off$succnt, 0 @@ -29,18 +29,18 @@ ## set freeze li r11, freezeDuration sth r11, off$freeze-off$$(r$$) -## total count (r11) +## total count (r11), success count (r10) ### if curArea != area0, totalCount = 1 li r11, 1 + li r10, 0 bne .onStart.done ### else total Count += 1 lwz r11, off$tolcnt-off$$(r$$) addi r11, r11, 1 + lwz r10, off$succnt-off$$(r$$) .onStart.done: stw r11, off$tolcnt-off$$(r$$) -### reset success count - li r11, 0 - stw r11, off$succnt-off$$(r$$) + stw r10, off$succnt-off$$(r$$) blr .onShineGet: