From b7655cd927df1208783bd8f3c8bf7e1882be1a73 Mon Sep 17 00:00:00 2001
From: Crementif <26669564+Crementif@users.noreply.github.com>
Date: Wed, 29 May 2019 17:49:16 +0200
Subject: [PATCH] [HW] Fix character swap pack

Fixes https://github.com/slashiee/cemu_graphic_packs/issues/330
---
 Mods/HyruleWarriors_CharacterSwap/patches.txt | 15 ++++-
 Mods/HyruleWarriors_CharacterSwap/rules.txt   | 63 ++++++++++---------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/Mods/HyruleWarriors_CharacterSwap/patches.txt b/Mods/HyruleWarriors_CharacterSwap/patches.txt
index c6e942fc..320df98d 100644
--- a/Mods/HyruleWarriors_CharacterSwap/patches.txt
+++ b/Mods/HyruleWarriors_CharacterSwap/patches.txt
@@ -1,5 +1,14 @@
-[HWPlayAsCuccov208]
+[HWCharacterSwapV208]
 moduleMatches = 0xE159AE91
 
-0x020EBF10 = li r11, $character;
-0x020EBF10 = li r11, $character;
+codeCaveSize = 0x010
+
+_characterValue = 0x00000000
+0x00000000 = .int $character
+
+_loadCharacterValue = 0x00000004
+0x00000004 = lis r11, _characterValue@ha
+0x00000008 = lwz r11, _characterValue@l(r11)
+0x0000000C = blr
+
+0x020EBF10 = bla _loadCharacterValue
diff --git a/Mods/HyruleWarriors_CharacterSwap/rules.txt b/Mods/HyruleWarriors_CharacterSwap/rules.txt
index 1f54370e..2073bce3 100644
--- a/Mods/HyruleWarriors_CharacterSwap/rules.txt
+++ b/Mods/HyruleWarriors_CharacterSwap/rules.txt
@@ -1,123 +1,124 @@
 [Definition]
 titleIds = 000500001017D800,000500001017D900,000500001017CD00
 name = Character Swap
-path = "Hyrule Warriors/Mods/Character Swap"
-description = Swaps the character you're playing as to the one you've selected with the presets.
+path = "Hyrule Warriors/Mods/Character Swap (in adventure mode)"
+description = Allows you to use a character that isn't selectable from the character selection screen normally in adventure mode.
 version = 3
 
 [Preset]
-name = Link 
+name = Link
 $character:int = 0
 
 [Preset]
-name = Zelda 
+name = Zelda
 $character:int = 1
 
 [Preset]
-name = Sheik 
+name = Sheik
 $character:int = 2
 
 [Preset]
-name = Impa 
+name = Impa
 $character:int = 3
 
 [Preset]
-name = Ganondorf 
+name = Ganondorf
 $character:int = 4
 
 [Preset]
-name = Darunia 
+name = Darunia
 $character:int = 5
 
 [Preset]
-name = Ruto 
+name = Ruto
 $character:int = 6
 
 [Preset]
-name = Agitha 
+name = Agitha
 $character:int = 7
 
 [Preset]
-name = Midna 
+name = Midna
 $character:int = 8
 
 [Preset]
-name = Fi 
+name = Fi
 $character:int = 9
 
 [Preset]
-name = Ghirahim 
+name = Ghirahim
 $character:int = 10
 
 [Preset]
-name = Zant 
+name = Zant
 $character:int = 11
 
 [Preset]
-name = Lana 
+name = Lana
 $character:int = 13
 
 [Preset]
-name = Cia 
+name = Cia
 $character:int = 44
 
 [Preset]
-name = Volga 
+name = Volga
 $character:int = 45
 
 [Preset]
-name = Wizzro 
+name = Wizzro
 $character:int = 46
 
 [Preset]
-name = Twilight Midna 
+name = Twilight Midna
 $character:int = 47
 
 [Preset]
-name = Young Link 
+name = Young Link
 $character:int = 48
 
 [Preset]
-name = Tingle 
+name = Tingle
 $character:int = 49
 
 [Preset]
-name = Linkle 
+name = Linkle
 $character:int = 50
 
 [Preset]
-name = Skull Kid 
+name = Skull Kid
 $character:int = 51
 
 [Preset]
-name = Toon Link 
+name = Toon Link
 $character:int = 52
 
 [Preset]
-name = Tetra 
+name = Tetra
 $character:int = 53
 
 [Preset]
-name = King Daphnes 54
+name = King Daphnes
+$character:int = 54
 
 [Preset]
-name = Medli 
+name = Medli
 $character:int = 55
 
 [Preset]
-name = Marin 
+name = Marin
 $character:int = 56
 
 [Preset]
-name = Toon Zelda 
+name = Toon Zelda
 $character:int = 57
 
 [Preset]
-name = Ravio 
+name = Ravio
 $character:int = 58
 
 [Preset]
-name = Yuga 
+name = Yuga
 $character:int = 59
 
 # https://github.com/Dekirai/HyruleWarriors-Trainer/blob/23a42b4ad580dfb847d6ef4ebcaa4c7a30df3eea/Hyrule%20Warriors/Form1.cs#L382