[PR #93] [MERGED] Develop #300

New Issue

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

Pecus commented

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

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/93
Author: @pkali
Created: 6/19/2022
Status: ✅ Merged
Merged: 6/19/2022
Merged by: @pkali

Base: master ← Head: develop

📝 Commits (10+)

1394524 FunkyBomb and LeapFrog bugfix #89
031416b "Underground" shot fixed.
186cacf The first attempt at handling defensive weapons
7b86fc9 Simple shield added
4c6b56a Now shield is displayed on a tank without PM
eace9eb Shield with energy added
91b613f Shield witch parachute added
cf40bf9 Slight change.
53e9f89 Shield "horns" drawing.
1b983b8 Index of hit tank in HitFlag

📊 Changes

12 files changed (+875 additions, -337 deletions)

View changed files

📝 README.md (+15 -0)
📝 artwork/HIMARS14.asm (+2 -2)
📝 artwork/weapons_AW5_mod.fnt (+0 -0)
📝 constants.asm (+46 -27)
📝 definitions.asm (+16 -16)
📝 display.asm (+14 -6)
📝 grafproc.asm (+122 -9)
📝 scorch.asm (+112 -47)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+327 -177)
📝 variables.asm (+13 -9)
📝 weapons.asm (+208 -44)

📄 Description

build 144

_{🔄 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/93 **Author:** [@pkali](https://github.com/pkali) **Created:** 6/19/2022 **Status:** ✅ Merged **Merged:** 6/19/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`1394524`](https://github.com/pkali/scorch_src/commit/1394524a267cac60c518e6faecba4258b79d8664) FunkyBomb and LeapFrog bugfix #89 - [`031416b`](https://github.com/pkali/scorch_src/commit/031416b8e63f3e85054f632334934cb1ee89efa7) "Underground" shot fixed. - [`186cacf`](https://github.com/pkali/scorch_src/commit/186cacf5bae11807966fc7bef32578070aa37cbe) The first attempt at handling defensive weapons - [`7b86fc9`](https://github.com/pkali/scorch_src/commit/7b86fc98cd546bcaa90f1c4b51919e1f0cf315b3) Simple shield added - [`4c6b56a`](https://github.com/pkali/scorch_src/commit/4c6b56a1e2a1e1ca8f3e446b37e9ff613229c3f9) Now shield is displayed on a tank without PM - [`eace9eb`](https://github.com/pkali/scorch_src/commit/eace9eb5cf8b1c8705067f178d229cca7dfd53e4) Shield with energy added - [`91b613f`](https://github.com/pkali/scorch_src/commit/91b613f166f278dd77eeda4930a6394b055df86b) Shield witch parachute added - [`cf40bf9`](https://github.com/pkali/scorch_src/commit/cf40bf905d32ea2ffa61d65a3c63cbe58d5dd6b4) Slight change. - [`53e9f89`](https://github.com/pkali/scorch_src/commit/53e9f89012309b5d60a92a576d1bf9cc4efe5c83) Shield "horns" drawing. - [`1b983b8`](https://github.com/pkali/scorch_src/commit/1b983b8d92e3f1bc79b2e1991cb48ae083f522ca) Index of hit tank in HitFlag ### 📊 Changes **12 files changed** (+875 additions, -337 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+15 -0) 📝 `artwork/HIMARS14.asm` (+2 -2) 📝 `artwork/weapons_AW5_mod.fnt` (+0 -0) 📝 `constants.asm` (+46 -27) 📝 `definitions.asm` (+16 -16) 📝 `display.asm` (+14 -6) 📝 `grafproc.asm` (+122 -9) 📝 `scorch.asm` (+112 -47) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+327 -177) 📝 `variables.asm` (+13 -9) 📝 `weapons.asm` (+208 -44) </details> ### 📄 Description build 144 --- <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:18 +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#300