[PR #132] [CLOSED] 5200 #135

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/132
Author: @pkali
Created: 9/12/2022
Status: ❌ Closed

Base: develop ← Head: 5200

📝 Commits (9)

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

📊 Changes

13 files changed (+1028 additions, -304 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)
📝 constants.asm (+18 -9)
📝 definitions.asm (+13 -5)
📝 display.asm (+0 -177)
➕ display_static.asm (+174 -0)
📝 scorch.asm (+72 -56)
➖ scorch.xex (+0 -0)
📝 textproc.asm (+5 -5)
📝 variables.asm (+61 -48)
📝 weapons.asm (+2 -4)

📄 Description

merge me to develop, man, I am tired of working in a separate branch!

_{🔄 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/132 **Author:** [@pkali](https://github.com/pkali) **Created:** 9/12/2022 **Status:** ❌ Closed **Base:** `develop` ← **Head:** `5200` --- ### 📝 Commits (9) - [`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 ### 📊 Changes **13 files changed** (+1028 additions, -304 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) 📝 `constants.asm` (+18 -9) 📝 `definitions.asm` (+13 -5) 📝 `display.asm` (+0 -177) ➕ `display_static.asm` (+174 -0) 📝 `scorch.asm` (+72 -56) ➖ `scorch.xex` (+0 -0) 📝 `textproc.asm` (+5 -5) 📝 `variables.asm` (+61 -48) 📝 `weapons.asm` (+2 -4) </details> ### 📄 Description merge me to develop, man, I am tired of working in a separate branch! --- <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:56 +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#135