[PR #156] [MERGED] Develop 1.28 #340

Closed
opened 2026-05-20 22:35:30 +02:00 by Pecus · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/156
Author: @pkali
Created: 4/22/2023
Status: Merged
Merged: 4/22/2023
Merged by: @pkali

Base: masterHead: develop


📝 Commits (10+)

  • 1337c83 Better colors init.
  • 4cf4eb1 Tank slide correction
  • af305f1 One more weapon of death
  • 0703a9d Proper texts after the BFG
  • 2de654d Small optimizations in status line display proc
  • d12102a Code cleanup and optimization
  • e1a930c More cleanup and optimization
  • 83969e7 Code cleanup
  • ab965c0 New splash screen (sorry KAZ :) ).
  • 2005f7b Better keys descriptions in menus

📊 Changes

18 files changed (+349 additions, -1034 deletions)

View changed files

📝 README.md (+23 -0)
artwork/Scorch50.asm (+0 -877)
artwork/Scorch50.fnt (+0 -0)
artwork/Scorch50.scr (+0 -0)
artwork/mm_rmt1.31.rmt (+0 -0)
artwork/mmm_16.lzs (+0 -0)
artwork/mmm_type_r.sap (+0 -0)
📝 artwork/sfx/rmtplayr_modified.asm (+22 -17)
📝 constants.asm (+27 -8)
📝 definitions.asm (+1 -0)
📝 display_static.asm (+17 -10)
📝 grafproc.asm (+98 -2)
📝 scorch.asm (+84 -69)
📝 scorch.bin (+0 -0)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+30 -36)
📝 variables.asm (+6 -6)
📝 weapons.asm (+41 -9)

📄 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/156 **Author:** [@pkali](https://github.com/pkali) **Created:** 4/22/2023 **Status:** ✅ Merged **Merged:** 4/22/2023 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`1337c83`](https://github.com/pkali/scorch_src/commit/1337c837917b93fcb6ae3bcdef3771aa849a20e0) Better colors init. - [`4cf4eb1`](https://github.com/pkali/scorch_src/commit/4cf4eb14c75e18ad583af2e5684f6f850b72150b) Tank slide correction - [`af305f1`](https://github.com/pkali/scorch_src/commit/af305f154ce6a68fc9a251e5d599b65e076da278) One more weapon of death - [`0703a9d`](https://github.com/pkali/scorch_src/commit/0703a9db933c045a450b0bd2c9d09fbe9139695c) Proper texts after the BFG - [`2de654d`](https://github.com/pkali/scorch_src/commit/2de654db3228a71dd867aa49e6b9ef12e18addc4) Small optimizations in status line display proc - [`d12102a`](https://github.com/pkali/scorch_src/commit/d12102ad6054d17a3aa3f5cf4801eb3627bde9c3) Code cleanup and optimization - [`e1a930c`](https://github.com/pkali/scorch_src/commit/e1a930ca44b27654bffd0b8fe2e9b24330ae7211) More cleanup and optimization - [`83969e7`](https://github.com/pkali/scorch_src/commit/83969e747b8596a26f461890dc0909cc878bcf03) Code cleanup - [`ab965c0`](https://github.com/pkali/scorch_src/commit/ab965c00b467c46c47ea2345b82f81fd050015c8) New splash screen (sorry KAZ :) ). - [`2005f7b`](https://github.com/pkali/scorch_src/commit/2005f7bf98171cb5733afd7bbbf4861e3da9f6a1) Better keys descriptions in menus ### 📊 Changes **18 files changed** (+349 additions, -1034 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+23 -0) ➖ `artwork/Scorch50.asm` (+0 -877) ➖ `artwork/Scorch50.fnt` (+0 -0) ➖ `artwork/Scorch50.scr` (+0 -0) ➖ `artwork/mm_rmt1.31.rmt` (+0 -0) ➖ `artwork/mmm_16.lzs` (+0 -0) ➖ `artwork/mmm_type_r.sap` (+0 -0) 📝 `artwork/sfx/rmtplayr_modified.asm` (+22 -17) 📝 `constants.asm` (+27 -8) 📝 `definitions.asm` (+1 -0) 📝 `display_static.asm` (+17 -10) 📝 `grafproc.asm` (+98 -2) 📝 `scorch.asm` (+84 -69) 📝 `scorch.bin` (+0 -0) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+30 -36) 📝 `variables.asm` (+6 -6) 📝 `weapons.asm` (+41 -9) </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:30 +02:00
Pecus closed this issue 2026-05-20 22:35:30 +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#340