[PR #145] [MERGED] Develop #144

New Issue

2026-05-20T22:32:58+02:00

Pecus commented

2026-05-20 22:32:58 +02:00

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/145
Author: @pkali
Created: 10/31/2022
Status: ✅ Merged
Merged: 10/31/2022
Merged by: @pkali

Base: master ← Head: develop

📝 Commits (10+)

89d6f48 README updt
1159241 GameOver screen optimization and return of Tab in weapon selection :)
1891bcc 5200 ingame dli fix
5f5ea0a Credits flickering fixed!
2aca68c ATRACT mode fixed.
3ed648b Better music in NTSC
d462c84 Bouncy Castle bounces Funky Bomb bug fixed #129
6f36973 Final (or not :) ) PAL and NTSC music by @mikerro
fe990a6 WaitOneFrame procedure sometimes hung in NTSC
c7aea8e DLI optimization

📊 Changes

15 files changed (+190 additions, -75 deletions)

View changed files

📝 MANUAL_EN.md (+17 -14)
📝 MANUAL_PL.md (+4 -4)
📝 README.md (+30 -2)
➕ artwork/sfx/scorch_str6-NTSC.rmt (+0 -0)
📝 constants.asm (+5 -2)
📝 definitions.asm (+2 -0)
📝 display_purchasedl.asm (+3 -2)
📝 display_static.asm (+4 -4)
📝 lib/5200MACRO.ASM (+4 -2)
📝 lib/MACRO.ASM (+4 -2)
📝 scorch.asm (+97 -34)
📝 scorch.bin (+0 -0)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+7 -5)
📝 weapons.asm (+13 -4)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/pkali/scorch_src/pull/145 **Author:** [@pkali](https://github.com/pkali) **Created:** 10/31/2022 **Status:** ✅ Merged **Merged:** 10/31/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`89d6f48`](https://github.com/pkali/scorch_src/commit/89d6f4834b7df2cf4b1102b9f102a3bc54f439b8) README updt - [`1159241`](https://github.com/pkali/scorch_src/commit/11592414a893979ddea2df6d0b891ad41b9bd899) GameOver screen optimization and return of Tab in weapon selection :) - [`1891bcc`](https://github.com/pkali/scorch_src/commit/1891bcc7f1899015ad37a1a717a81528cb44403f) 5200 ingame dli fix - [`5f5ea0a`](https://github.com/pkali/scorch_src/commit/5f5ea0a752cddf81a952a2f4da4aa82b76320856) Credits flickering fixed! - [`2aca68c`](https://github.com/pkali/scorch_src/commit/2aca68c41c277164e9804213cfb340430b13f9cc) ATRACT mode fixed. - [`3ed648b`](https://github.com/pkali/scorch_src/commit/3ed648b01f42f40ad79c86a5740771a5a422d4b9) Better music in NTSC - [`d462c84`](https://github.com/pkali/scorch_src/commit/d462c84577b96fd5d8825f9c7fec18dcb2244d52) Bouncy Castle bounces Funky Bomb bug fixed #129 - [`6f36973`](https://github.com/pkali/scorch_src/commit/6f369735c3f52287590d0b53742794edea247a69) Final (or not :) ) PAL and NTSC music by @mikerro - [`fe990a6`](https://github.com/pkali/scorch_src/commit/fe990a6668a98ef3334192db1514fad1570bf857) WaitOneFrame procedure sometimes hung in NTSC - [`c7aea8e`](https://github.com/pkali/scorch_src/commit/c7aea8e3ab3f3a49fa0f1fceea98a7f4044186db) DLI optimization ### 📊 Changes **15 files changed** (+190 additions, -75 deletions) <details> <summary>View changed files</summary> 📝 `MANUAL_EN.md` (+17 -14) 📝 `MANUAL_PL.md` (+4 -4) 📝 `README.md` (+30 -2) ➕ `artwork/sfx/scorch_str6-NTSC.rmt` (+0 -0) 📝 `constants.asm` (+5 -2) 📝 `definitions.asm` (+2 -0) 📝 `display_purchasedl.asm` (+3 -2) 📝 `display_static.asm` (+4 -4) 📝 `lib/5200MACRO.ASM` (+4 -2) 📝 `lib/MACRO.ASM` (+4 -2) 📝 `scorch.asm` (+97 -34) 📝 `scorch.bin` (+0 -0) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+7 -5) 📝 `weapons.asm` (+13 -4) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Pecus added the pull-request label 2026-05-20 22:32:58 +02:00

Pecus closed this issue

2026-05-20 22:32:59 +02:00

Pecus referenced this issue

2026-05-20 22:35:25 +02:00

[PR #144] [MERGED] Develop #324

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/scorch_src#144