Modify ace_wood include and related pages

I felt that it might make more sense to refer to the Ace3DS+ build on the flashcard archive by the file name rather than splitting it into separate Ace3DS+ / R4iLS wood versions. I've also moved the message about game compatibility into the include since each page has a copy of it.
flashcarts · Jun 13, 2024 · d54d271 · d54d271
1 parent 46eda33
commit d54d271
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/_card/ace3ds-plus.md b/_card/ace3ds-plus.md
@@ -10,7 +10,7 @@ sdhc: true
 dsi: Latest firmware
 3ds: Latest firmware
 downloads:
-  Ace3DS+ Wood R4 1.62:
+  Ace3DS+/R4iLS Wood R4 1.62:
     url: https://flashcard-archive.ds-homebrew.com/Ace3DS+_R4iLS/Ace3DS+_R4iLS_Wood_R4_1.62.zip
   AOS for Ace3DSPlus:
     url: http://github.com/flashcarts/AOS/releases/latest/download/AOS_Ace3DSPlus.zip
@@ -32,8 +32,6 @@ website: http://ace3ds.com
 
 The Ace3DS+ is based on the R4iLS line of flashcarts. This means that it will not work without a microSD card inserted into the card.
 
-This flashcart will use ACE Wood 1.62, not to be confused with R4 Wood 1.62. ACE Wood 1.62 is based on the open source R4 Wood 1.25, and adds some patches on top of it to support more modern games. However, it is missing some patches for newer games and some titles (like Warioware D.I.Y) may refuse to launch. Others like Pokemon Black/White 2 are missing anti-piracy patches and require you to either have the "Bypass Anti-Piracy" cheat to be enabled, or have a pre-patched ROM.
-
 Clones of the Ace3DS+ are quite common, though not all of them look the same. Ace3DS+ clones cannot be flashed for ntrboot.
 
 {% include kernels/ace_wood.md %}
diff --git a/_card/ace3ds-x.md b/_card/ace3ds-x.md
@@ -28,6 +28,4 @@ When the switch is in the bottom position, it is in DS mode. You should see `Spo
 
 Keep in mind that this flashcart **will not work** in either mode without a microSD card inserted.
 
-This flashcart will use ACE Wood 1.62, not to be confused with R4 Wood 1.62. ACE Wood 1.62 is based on the open source R4 Wood 1.25, and adds some patches on top of it to support more modern games. However, it is missing some patches for newer games and some titles (like Warioware D.I.Y) may refuse to launch. Others like Pokemon Black/White 2 are missing anti-piracy patches and require you to either have the "Bypass Anti-Piracy" cheat to be enabled, or have a pre-patched ROM.
-
 {% include kernels/ace_wood.md %}
diff --git a/_card/r4isdhc-com-cn.md b/_card/r4isdhc-com-cn.md
@@ -10,7 +10,7 @@ sdhc: true
 dsi: Latest firmware
 3ds: Latest firmware
 downloads:
-  R4iLS Wood R4 1.62:
+  Ace3DS+/R4iLS Wood R4 1.62:
     url: https://flashcard-archive.ds-homebrew.com/Ace3DS+_R4iLS/Ace3DS+_R4iLS_Wood_R4_1.62.zip
   AOS for R4iLS:
     url: https://github.com/flashcarts/AOS/releases/latest/download/AOS_R4iLS.zip
@@ -22,8 +22,6 @@ website: http://r4isdhc.com.cn
 
 This flashcart is an R4iLS clone. This means that it will not work without a microSD card inserted into the card. This flashcart is also being sold with different coloured shells and labels, though the hardware inside is mostly the same across all of them.
 
-This flashcart will use Ace Wood 1.62, not to be confused with R4 Wood 1.62. Ace Wood 1.62 is based on the open source R4 Wood 1.25, it adds some patches on top of it to support more modern games. However, it is missing some patches for newer games and some titles (like Warioware D.I.Y) may refuse to launch.
-
-Older variants of this flashcart (pre-2019) can be flashed with ntrboot. However, they cannot be reflashed to their DS firmware. Newer models cannot be flashed with ntrboot.
+Older variants of this flashcart can be flashed with ntrboot. However, once flashed, they cannot be reflashed to their DS firmware. Newer models cannot be flashed with ntrboot.
 
 {% include kernels/ace_wood.md r4ils=true %}
diff --git a/_card/r4isdhc-hk-2020-23.md b/_card/r4isdhc-hk-2020-23.md
@@ -10,7 +10,7 @@ sdhc: true
 dsi: Latest firmware
 3ds: Latest firmware
 downloads:
-  R4iLS Wood R4 1.62:
+  Ace3DS+/R4iLS Wood R4 1.62:
     url: https://flashcard-archive.ds-homebrew.com/Ace3DS+_R4iLS/Ace3DS+_R4iLS_Wood_R4_1.62.zip
   AOS for R4iLS:
     url: https://github.com/flashcarts/AOS/releases/latest/download/AOS_R4iLS.zip
@@ -21,8 +21,6 @@ images:
 
 This flashcart is an R4iLS clone. It is typically sold as a "Dual Core" 2020-2023 flashcart from r4isdhc.hk. This means that it will not work without a microSD card inserted into the card.
 
-This flashcart will use Ace Wood 1.62, not to be confused with R4 Wood 1.62. Ace Wood 1.62 is based on the open source R4 Wood 1.25, it adds some patches on top of it to support more modern games. However, it is missing some patches for newer games and some titles (like Warioware D.I.Y) may refuse to launch.
-
 This flashcart cannot be flashed for ntrboot. Note that some [2020 models have been shipped with R4iTT-clone hardware](/card/r4isdhc-hk-pre2020) instead of being based on the R4iLS.
 
 {% include kernels/ace_wood.md r4ils=true %}
diff --git a/_includes/kernels/ace_wood.md b/_includes/kernels/ace_wood.md
@@ -1,21 +1,26 @@
 {% if include.r4ils %}
-    {% assign cart = "R4iLS" %}
+    {% assign wood = "Ace3DS+/R4iLS" %}
+    {% assign aos = "R4iLS" %}
 {% elsif include.gateway %}
-    {% assign cart = "Gateway Blue" %}
+    {% assign wood = "Gateway Blue" %}
+    {% assign aos = "Gateway" %}
 {% else %}
-    {% assign cart = "Ace3DS+"%}
+    {% assign wood = "Ace3DS+/R4iLS" %}
+    {% assign aos = "Ace3DSPlus" %}
 {% endif %}
 
-### Setup Instructions ({{ cart }} Wood 1.62)
-1. Download {{ cart }} Wood 1.62
-1. Extract the {{ cart }} Wood 1.62 .zip to your SD card root.
+This flashcart will use ACE Wood 1.62, not to be confused with R4 Wood 1.62. ACE Wood 1.62 is based on an old version of R4 Wood from when it was open source, and adds some patches on top of it to support more modern games. However, it is missing some anti-piracy patches for newer games (notably Pokemon Black/White 2) and some titles (like Warioware D.I.Y) may refuse to launch.
+
+### Setup Instructions ({{ wood }} Wood 1.62)
+1. Download {{ wood }} Wood 1.62
+1. Extract the {{ wood }} Wood 1.62 .zip to your SD card root.
 1. Place any `.nds` game ROMs you'd like to play into a folder of your choice which isn't the `__rpg` folder.
     - (Optional) You may want to create a `Games` folder to store your ROMs in to keep the root of your SD card organised.
 
 #### Setup Instructions (AOS)
 AOS is a multi-loader for Ace3DS+ and related carts. You can find a link to an updated repack here: <https://github.com/flashcarts/AOS>
 
-1. Download AOS for {{ cart }}
-1. Extract the AOS for {{ cart }} .zip to your SD card root.
+1. Download AOS for {{ aos }}
+1. Extract the AOS for {{ aos }} .zip file to your SD card root.
 1. Place any game ROMs you'd like to play into a folder of your choice which isn't the `__rpg` folder.
     - (Optional) You may wish to use the `/roms/` folder structure which comes with AOS for easy organisation. For instance, `.gba` ROMs will go into the `/roms/gba/` folder, `.nds` ROMs will go into the `/roms/nds/` folder, etc.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,6 +28,4 @@ When the switch is in the bottom position, it is in DS mode. You should see `Spo

		Keep in mind that this flashcart will not work in either mode without a microSD card inserted.

		This flashcart will use ACE Wood 1.62, not to be confused with R4 Wood 1.62. ACE Wood 1.62 is based on the open source R4 Wood 1.25, and adds some patches on top of it to support more modern games. However, it is missing some patches for newer games and some titles (like Warioware D.I.Y) may refuse to launch. Others like Pokemon Black/White 2 are missing anti-piracy patches and require you to either have the "Bypass Anti-Piracy" cheat to be enabled, or have a pre-patched ROM.

		{% include kernels/ace_wood.md %}