[PR #123] [MERGED] Develop #132

New Issue

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

Pecus commented

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

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/123
Author: @pkali
Created: 8/22/2022
Status: ✅ Merged
Merged: 8/22/2022
Merged by: @pkali

Base: master ← Head: develop

📝 Commits (10+)

c413837 Activate defensives before round
b46b275 Inventory song added
045bdac zpage opt
b6bf153 Purchase/Inventory titles added
b5ea72a Rest of the screen titles
255c240 minor label changes
bccb931 Purchase/Activate description as constant text
86c810d Merge branch 'develop' of https://github.com/pkali/scorch_src into develop
185ca5d Rearranging display.asm and fix for Long Schlong activation :)
84c4e0d Smoke Tracer fixed!

📊 Changes

22 files changed (+2267 additions, -1209 deletions)

View changed files

📝 .gitignore (+1 -1)
➕ MANUAL_EN.md (+186 -0)
➕ MANUAL_PL.md (+181 -0)
📝 README.md (+29 -2)
📝 artwork/Scorch50.asm (+42 -42)
📝 artwork/sfx/feat.txt (+2 -2)
📝 artwork/sfx/scorch_str4.rmt (+0 -0)
➖ artwork/sfx/scorch_trial0j.rmt (+0 -0)
➖ artwork/sfx/scorch_trial0j_stripped.rmt (+0 -0)
📝 artwork/talk.asm (+5 -0)
📝 constants.asm (+35 -28)
📝 definitions.asm (+17 -9)
📝 display.asm (+150 -113)
📝 grafproc.asm (+151 -35)
➖ instrukcjaPL.txt (+0 -157)
➕ lib/ATARISYS.ASM (+653 -0)
➖ lib/atari.hea (+0 -514)
📝 scorch.asm (+144 -72)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+170 -135)

...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/123 **Author:** [@pkali](https://github.com/pkali) **Created:** 8/22/2022 **Status:** ✅ Merged **Merged:** 8/22/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`c413837`](https://github.com/pkali/scorch_src/commit/c413837ffd56fbaf9d8ee445759944a7bfad91d2) Activate defensives before round - [`b46b275`](https://github.com/pkali/scorch_src/commit/b46b275b663cbcf7b706896e0eca7e5a42b058c4) Inventory song added - [`045bdac`](https://github.com/pkali/scorch_src/commit/045bdacf650be72c4d38fa3934a8aa22d5192620) zpage opt - [`b6bf153`](https://github.com/pkali/scorch_src/commit/b6bf1532d7052d4261422a408ffa7057367eb023) Purchase/Inventory titles added - [`b5ea72a`](https://github.com/pkali/scorch_src/commit/b5ea72ac93ce3c92b9ef467b76f28d5a29e32ecf) Rest of the screen titles - [`255c240`](https://github.com/pkali/scorch_src/commit/255c240d7a06c4e1d88a41424f7266a4f74a14ac) minor label changes - [`bccb931`](https://github.com/pkali/scorch_src/commit/bccb9314338981b7995504a69e0176f549b07d24) Purchase/Activate description as constant text - [`86c810d`](https://github.com/pkali/scorch_src/commit/86c810d030b0bc496de9c02f7bb04ff672873e8d) Merge branch 'develop' of https://github.com/pkali/scorch_src into develop - [`185ca5d`](https://github.com/pkali/scorch_src/commit/185ca5db050884a33d15fc6e0f9b6aff622e1a93) Rearranging display.asm and fix for Long Schlong activation :) - [`84c4e0d`](https://github.com/pkali/scorch_src/commit/84c4e0dcdd5f2e1546f9e2ffb161179e097bd1c9) Smoke Tracer fixed! ### 📊 Changes **22 files changed** (+2267 additions, -1209 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -1) ➕ `MANUAL_EN.md` (+186 -0) ➕ `MANUAL_PL.md` (+181 -0) 📝 `README.md` (+29 -2) 📝 `artwork/Scorch50.asm` (+42 -42) 📝 `artwork/sfx/feat.txt` (+2 -2) 📝 `artwork/sfx/scorch_str4.rmt` (+0 -0) ➖ `artwork/sfx/scorch_trial0j.rmt` (+0 -0) ➖ `artwork/sfx/scorch_trial0j_stripped.rmt` (+0 -0) 📝 `artwork/talk.asm` (+5 -0) 📝 `constants.asm` (+35 -28) 📝 `definitions.asm` (+17 -9) 📝 `display.asm` (+150 -113) 📝 `grafproc.asm` (+151 -35) ➖ `instrukcjaPL.txt` (+0 -157) ➕ `lib/ATARISYS.ASM` (+653 -0) ➖ `lib/atari.hea` (+0 -514) 📝 `scorch.asm` (+144 -72) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+170 -135) _...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:32:55 +02:00

Pecus closed this issue

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

Pecus referenced this issue

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

[PR #132] [CLOSED] 5200 #135

Pecus referenced this issue

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

[PR #132] [CLOSED] 5200 #319

Pecus referenced this issue

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

[PR #132] 5200 #322