Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.0 phase 2 #201

Merged
merged 18 commits into from
Nov 19, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Found what broke Pokemon Yellow :)
torch2424 committed Nov 18, 2018
commit ce3231cc3a0a5f8ae4335423177ca1574c58421e
4 changes: 3 additions & 1 deletion core/interrupts/interrupts.ts
Original file line number Diff line number Diff line change
@@ -164,7 +164,9 @@ function _handleInterrupt(bitPosition: i32): void {
// Push the next instruction, not the halt itself (TCAGBD).
Cpu.stackPointer = Cpu.stackPointer - 2;
if (Cpu.isHalted()) {
sixteenBitStoreIntoGBMemory(Cpu.stackPointer, Cpu.programCounter + 1);
// TODO: This breaks Pokemon Yellow, And OG Link's awakening. Find out why...
// sixteenBitStoreIntoGBMemory(Cpu.stackPointer, Cpu.programCounter + 1);
sixteenBitStoreIntoGBMemory(Cpu.stackPointer, Cpu.programCounter);
} else {
sixteenBitStoreIntoGBMemory(Cpu.stackPointer, Cpu.programCounter);
}
Binary file modified dist/core/core.untouched.wasm
Binary file not shown.
Loading