Merge branch 'RHH/master' into RHH/pr/version/1.5.0

# Conflicts:
#	data/battle_scripts_1.s
#	data/scripts/debug.inc
#	src/battle_util.c
#	test/ability_contrary.c

.github/workflows/manual.yml

@@ -0,0 +1,16 @@
+name: Close issues related to a merged pull request based on master branch.
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - upcoming
+
+jobs:
+  closeIssueOnPrMergeTrigger:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Closes issues related to a merged pull request.
+        uses: ldez/gha-mjolnir@v1.0.3