[PR #58] [MERGED] master reconciliation #111

New Issue

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

Pecus commented

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

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/58
Author: @pkali
Created: 5/14/2022
Status: ✅ Merged
Merged: 5/14/2022
Merged by: @pkali

Base: master ← Head: develop

📝 Commits (4)

572bee9 Test
91b39e7 Minor optimizations
de5bfab Tank colors bugfix & new DLI for purchase screen
d766088 colors upd+weapon change sfx

📊 Changes

6 files changed (+43 additions, -34 deletions)

View changed files

📝 constants.asm (+6 -3)
📝 grafproc.asm (+9 -17)
📝 scorch.asm (+23 -12)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+1 -1)
📝 weapons.asm (+4 -1)

📄 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/58 **Author:** [@pkali](https://github.com/pkali) **Created:** 5/14/2022 **Status:** ✅ Merged **Merged:** 5/14/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (4) - [`572bee9`](https://github.com/pkali/scorch_src/commit/572bee982a1d261688d8f79ecf89ab5d065f8500) Test - [`91b39e7`](https://github.com/pkali/scorch_src/commit/91b39e736ba18586c7979042d9afbb4dc4c9cc00) Minor optimizations - [`de5bfab`](https://github.com/pkali/scorch_src/commit/de5bfab2a81e2ecb009bd3ce61f2d54079980af7) Tank colors bugfix & new DLI for purchase screen - [`d766088`](https://github.com/pkali/scorch_src/commit/d766088b66c869c26417e9586c3c920ae5275be5) colors upd+weapon change sfx ### 📊 Changes **6 files changed** (+43 additions, -34 deletions) <details> <summary>View changed files</summary> 📝 `constants.asm` (+6 -3) 📝 `grafproc.asm` (+9 -17) 📝 `scorch.asm` (+23 -12) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+1 -1) 📝 `weapons.asm` (+4 -1) </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:47 +02:00

Pecus closed this issue

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

Pecus referenced this issue

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

[PR #146] [MERGED] Develop #141

Pecus referenced this issue

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

[GH-ISSUE #111] Wrap up and down inventory and shop scrolling #271

Pecus referenced this issue

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

[PR #146] [MERGED] Develop #325