Finished the branching refactoring and even commented the WML a little bit.

data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg

@@ -29,8 +29,8 @@
     turns=18
     victory_when_enemies_defeated=no
 
-    # Sir Gerrick's Men. Deoran, Ethiliel and her bodyguards will be removed in
-    # a prestart event.
+    # Deoran will be removed and Gerrick instated as the leader in a prestart
+    # event.
 
     [side]
         side=1
@@ -98,6 +98,9 @@
     [event]
         name=prestart
 
+        # Store away Deoran, his human troops, Ethiliel and her bodyguards, so
+        # that only Gerrick and the rest of the elves remain.
+
         [store_unit]
             [filter]
                 description=Deoran
@@ -132,6 +135,8 @@
             variable=stored_Deoran_army
         [/store_unit]
 
+        # Recall Gerrick and set him as the leader.
+
         [recall]
             description=Sir Gerrick
             x,y=16,23
@@ -373,6 +378,10 @@
             image=wesnoth-icon.png
         [/message]
 
+
+        # The next scenario is again led by Deoran, so store away Gerrick and
+        # his troops, except those remaining on the recall list.
+
         [store_unit]
             variable=stored_Sir_Gerrick_army
             [filter]
@@ -382,6 +391,10 @@
             kill=yes
         [/store_unit]
 
+
+        # Reinstate Deoran as the leader. Cleaner to do it here than at the
+        # beginning of the next scenario.
+
         {VARIABLE stored_Deoran.x 16}
         {VARIABLE stored_Deoran.y 23}
 

data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg

@@ -617,4 +617,23 @@
         {CLEAR_VARIABLE bomb_placed}
         {CLEAR_VARIABLE troll_allies}
     [/event]
+
+
+    # Unstore Sir Gerrick and his troops back so that everyone will be happily
+    # reunited at the beginning of the next scenario.
+
+    [event]
+        name=victory
+
+        {FOREACH stored_Sir_Gerrick_army i}
+            {VARIABLE stored_Sir_Gerrick_army[$i].x "recall"}
+            {VARIABLE stored_Sir_Gerrick_army[$i].y "recall"}
+
+            [unstore_unit]
+                variable=stored_Sir_Gerrick_army[$i]
+            [/unstore_unit]
+        {NEXT i}
+
+        {CLEAR_VARIABLE stored_Sir_Gerrick_army}
+    [/event]
 [/scenario]

data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg

@@ -89,9 +89,23 @@
         [/ai]
     [/side]
 
-    #start
+    [event]
+        name=prestart
+
+        {MODIFY_UNIT description=Deoran type "Horseman Commander"}
+
+        [disallow_recruit]
+            side=1
+            type=Elvish Fighter, Elvish Shaman
+        [/disallow_recruit]
+    [/event]
+
     [event]
         name=start
+
+        [recall]
+            description=Sir Gerrick
+        [/recall]
         [recall]
             description=Ethiliel
         [/recall]
@@ -99,49 +113,6 @@
             description=Minister Hylas
         [/recall]
 
-        {VARIABLE sir_gerrick_store.canrecruit 0}
-        {VARIABLE sir_gerrick_store.x 21}
-        {VARIABLE sir_gerrick_store.y 16}
-
-        [unstore_unit]
-            variable=sir_gerrick_store
-            find_vacant=yes
-            [effect]
-                apply_to=hitpoints
-                heal_full=yes
-            [/effect]
-        [/unstore_unit]
-
-        [store_unit]
-            variable=deoran_store
-            kill=yes
-            [filter]
-                description=Deoran
-            [/filter]
-        [/store_unit]
-
-        [set_variable]
-            name=deoran_store.hitpoints
-            value=38
-        [/set_variable]
-
-        [set_variable]
-            name=deoran_store.type
-            value=Horseman Commander
-        [/set_variable]
-
-        [unstore_unit]
-            variable=deoran_store
-            find_vacant=yes
-        [/unstore_unit]
-
-        {CLEAR_VARIABLE deoran_store}
-
-        [disallow_recruit]
-            side=1
-            type=Elvish Fighter, Elvish Shaman
-        [/disallow_recruit]
-
         [message]
             speaker=Sir Gerrick
             message= _ "Commander! I took your message to the council, and your deeds have pleased them. Are the undead finally gone from our lands?"