[PR #144] [MERGED] Develop #324

New Issue

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

Pecus commented

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

📋 Pull Request Information

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

Base: master ← Head: develop

📝 Commits (10+)

cad3a0c WIP: conditional compilation, the beginnings
c9855b6 typos, not important
0ad513d shortened version
8a73202 rmtplayr_modified.asm <-- simplified and working RMT player
e782e10 rmtplyr de-self-modified
4078722 5200 cart size full music, a 4KiB glitch to be fixed still
2471ca7 a800 version for merge with develop
a98c0b8 merge conflict reslv
58eec3d ver bump
fad8c2c merge conflict fix

📊 Changes

22 files changed (+1968 additions, -530 deletions)

View changed files

➕ artwork/sfx/rmtplayr_modified.asm (+643 -0)
➕ artwork/sfx/scorch_SFX-feat.txt (+40 -0)
➕ artwork/sfx/scorch_SFX-only-str.rmt (+0 -0)
➕ artwork/sfx/scorch_SFX-only.rmt (+0 -0)
📝 artwork/talk.asm (+3 -3)
📝 constants.asm (+35 -12)
📝 definitions.asm (+4 -8)
➕ display_main_menu.asm (+45 -0)
➕ display_purchasedl.asm (+45 -0)
📝 display_static.asm (+74 -109)
➕ display_status.asm (+11 -0)
📝 grafproc.asm (+45 -3)
➕ lib/5200MACRO.ASM (+147 -0)
➕ lib/5200SYS.ASM (+272 -0)
📝 lib/ATARISYS.ASM (+68 -0)
📝 lib/MACRO.ASM (+1 -1)
📝 scorch.asm (+325 -216)
➕ scorch.bin (+0 -0)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+84 -73)

...and 2 more files

📄 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/144 **Author:** [@pkali](https://github.com/pkali) **Created:** 10/17/2022 **Status:** ✅ Merged **Merged:** 10/17/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`cad3a0c`](https://github.com/pkali/scorch_src/commit/cad3a0cf38365ec946a11da23845036655e807d0) WIP: conditional compilation, the beginnings - [`c9855b6`](https://github.com/pkali/scorch_src/commit/c9855b66bae5ce4e834480287f63d5c5ede8d02b) typos, not important - [`0ad513d`](https://github.com/pkali/scorch_src/commit/0ad513d5cb0b11d07e6e9213468150cd3f25e4a6) shortened version - [`8a73202`](https://github.com/pkali/scorch_src/commit/8a73202fa3dba96dd272dc079922d914c2a021e0) rmtplayr_modified.asm <-- simplified and working RMT player - [`e782e10`](https://github.com/pkali/scorch_src/commit/e782e101f586924908cb3115d088e7dc70519a21) rmtplyr de-self-modified - [`4078722`](https://github.com/pkali/scorch_src/commit/4078722b29696cb7ae90e5b2bb9d6f77967c1b56) 5200 cart size full music, a 4KiB glitch to be fixed still - [`2471ca7`](https://github.com/pkali/scorch_src/commit/2471ca7282379c0dd693548689d1ea44a7dc31f7) a800 version for merge with develop - [`a98c0b8`](https://github.com/pkali/scorch_src/commit/a98c0b81b91e07b45450df6643f9e2203c0bb295) merge conflict reslv - [`58eec3d`](https://github.com/pkali/scorch_src/commit/58eec3dc9c421efd24e9fe87a7e71e3e9387d01f) ver bump - [`fad8c2c`](https://github.com/pkali/scorch_src/commit/fad8c2c06abf785ae00412821d80b06d638d80d2) merge conflict fix ### 📊 Changes **22 files changed** (+1968 additions, -530 deletions) <details> <summary>View changed files</summary> ➕ `artwork/sfx/rmtplayr_modified.asm` (+643 -0) ➕ `artwork/sfx/scorch_SFX-feat.txt` (+40 -0) ➕ `artwork/sfx/scorch_SFX-only-str.rmt` (+0 -0) ➕ `artwork/sfx/scorch_SFX-only.rmt` (+0 -0) 📝 `artwork/talk.asm` (+3 -3) 📝 `constants.asm` (+35 -12) 📝 `definitions.asm` (+4 -8) ➕ `display_main_menu.asm` (+45 -0) ➕ `display_purchasedl.asm` (+45 -0) 📝 `display_static.asm` (+74 -109) ➕ `display_status.asm` (+11 -0) 📝 `grafproc.asm` (+45 -3) ➕ `lib/5200MACRO.ASM` (+147 -0) ➕ `lib/5200SYS.ASM` (+272 -0) 📝 `lib/ATARISYS.ASM` (+68 -0) 📝 `lib/MACRO.ASM` (+1 -1) 📝 `scorch.asm` (+325 -216) ➕ `scorch.bin` (+0 -0) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+84 -73) _...and 2 more files_ </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:35:25 +02:00

Pecus closed this issue

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

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/scorch_src#324