Merge branch 'develop' of https://github.com/project64/project64 into develop

This commit is contained in:
zilmar 2025-05-29 20:19:25 +09:30
commit d357d20aad
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ Project64 is a free and open-source emulator for the Nintendo 64 and Nintendo 64
* [Dependencies](#dependencies)
* [Contributing](#contributing)
* [Maintainers and contributors](#maintainers-and-contributors)
* [🔗 Links](#---links)
* [Links](#links)
* [License](#license)
## Features
@ -98,7 +98,7 @@ See the [contributing](./.github/CONTRIBUTING.md) file for ways to get started.
Also see the list of [community contributors](https://github.com/project64/project64/contributors).
## 🔗 Links
## Links
- [Website](https://pj64-emu.com)
- [Discord](https://discord.gg/Cg3zquF)

View File

@ -9609,7 +9609,7 @@ void CX86RecompilerOps::OverflowDelaySlot(bool TestTimer)
if (TestTimer)
{
m_Assembler.MoveConstToVariable(&g_System->m_TestTimer, "R4300iOp::m_TestTimer", TestTimer);
m_Assembler.MoveConstByteToVariable(&g_System->m_TestTimer, "R4300iOp::m_TestTimer", TestTimer);
}
m_Assembler.PushImm32("g_System->CountPerOp()", g_System->CountPerOp());