Merge branch 'main' into palindrome_pull_fix

loathers · Dec 13, 2024 · 971328a · 971328a
2 parents ff3033d + 8512855
commit 971328a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -114,6 +114,10 @@ Tokoeka (IGN: Asmodais (#2071543))
 
 Alium (IGN: Alium (#1933235))
 
+dsimich (IGN: erct657 (#584803))
+
+HippoKingKoL (IGN: HippoKing (#1716533))
+
 ## Special Thanks
 
 This script would obviously not be possible without the work of Cheesecookie and soolar.

diff --git a/RELEASE/scripts/autoscend/auto_adventure.ash b/RELEASE/scripts/autoscend/auto_adventure.ash
@@ -132,9 +132,9 @@ boolean autoAdvBypass(int urlGetFlags, string[int] url, location loc, string opt
 	}
 
 	// handle the initial combat or choice the easy way.
-	string combatPage = "<b>Combat";
+	string combatPage = ">Combat";
 	if(in_pokefam()) {
-		combatPage = "<b>Fight!";
+		combatPage = ">Fight!";
 	}
 	if (contains_text(page, combatPage)) {
 		auto_log_info("autoAdvBypass has encountered a combat! (param: '" + option + "')", "green");

diff --git a/docs/PULL_REQUEST_TEMPLATE b/docs/PULL_REQUEST_TEMPLATE
@@ -16,3 +16,4 @@ Testing ASH scripts is tricky and generally involves you doing multiple runs wit
 - [ ] I have performed a self-review of my own code.
 - [ ] I have commented my code, particularly in hard-to-understand areas.
 - [ ] I have based my pull request against the [main branch](https://github.com/loathers/autoscend/tree/main) or have a good reason not to.
+- [ ] I have updated the GitHub wiki [path](https://github.com/loathers/autoscend/wiki/Path-Support) or [IOTM](https://github.com/loathers/autoscend/wiki/IOTM-Support) support pages, as appropriate.