From 38062842ab17449419a3f38f8dd6106961c3e2d5 Mon Sep 17 00:00:00 2001
From: masterofcontroversy <masterofcontroversy@mail.com>
Date: Tue, 28 Mar 2023 22:04:22 -0400
Subject: [PATCH 1/2] Bugfix on autolevel when essential fix isn't used

---
 .../AutolevellingSaves/WriteBasesForPenalty.dmp   | Bin 44 -> 44 bytes
 .../AutolevellingSaves/WriteBasesForPenalty.s     |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.dmp b/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.dmp
index 39358cfa584da83f1d8553cd9cbb9dd47885cf6e..e38820be0128fd4c989842ab5164268aec152a50 100644
GIT binary patch
delta 17
YcmdPVnV`U<oWbbH;m*LYwSkcX03Xi-cK`qY

delta 17
YcmdPVnV`VKt-$Cl;m*LYwSkcX030a;DF6Tf

diff --git a/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s b/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
index 5da8a3c3a7..37d2854ad8 100644
--- a/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
+++ b/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
@@ -6,7 +6,7 @@
 
 @r0 = Base res total | Must be 0xB during return
 @r2 = Level Count | Preserve
-@r3 = Character Data (Overwritten by jump)
+@r3 = Character Data | Preserve (Overwritten by jump)
 @r4 = Unit Pointer | Preserve
 
 @Revert r3 to orginal value
@@ -19,14 +19,14 @@ strb  r0, [r4, #0x19]   @Store base luck total
 
 @Get char base magic
 ldrb  r0, [r3, #0x4]    @r0 = Character index
-lsl   r0, #0x1          @Multiply by size of MagCharTable entry
+lsl   r0, #0x1          @Multiply by 2 (size of MagCharTable entry)
 ldr   r3, MagCharTable
 ldrb  r0, [r3, r0]      @r0 = Char base magic
 
 @Get class base magic
 ldr   r1, [r4, #0x4]    @r1 = Class Data pointer
 ldrb  r1, [r1, #0x4]    @r1 = Class index
-lsl   r1, #0x2          @Multiply by size of MagClassTable entry
+lsl   r1, #0x2          @Multiply by 4 (size of MagClassTable entry)
 ldr   r3, MagClassTable
 ldrb  r1, [r3, r1]      @r1 = Class base magic
 
@@ -36,11 +36,11 @@ mov   r1, #0x3A         @r1 = Unit magic offset
 strb  r0, [r4, r1]      @Store base magic total
 
 @Cleanup
-mov   r0, #0xB          @Set r0 before return
+ldr   r3, [r4]          @r3 = Character Data pointer
 
 @Return
-ldr   r3, =ReturnAddress
-bx    r3
+ldr   r1, =ReturnAddress
+bx    r1
 
 .ltorg
 MagCharTable:

From 8da4b2e5ce5f8c39854f6d206cc742bb1b2aa1a6 Mon Sep 17 00:00:00 2001
From: masterofcontroversy <masterofcontroversy@mail.com>
Date: Tue, 28 Mar 2023 22:25:09 -0400
Subject: [PATCH 2/2] Update comment

---
 .../StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s b/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
index 37d2854ad8..50dd896d79 100644
--- a/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
+++ b/EngineHacks/ExternalHacks/StrMagSplit/StrMagSplit/AutolevellingSaves/WriteBasesForPenalty.s
@@ -4,7 +4,7 @@
 
 .equ MagClassTable, MagCharTable+4
 
-@r0 = Base res total | Must be 0xB during return
+@r0 = Base res total
 @r2 = Level Count | Preserve
 @r3 = Character Data | Preserve (Overwritten by jump)
 @r4 = Unit Pointer | Preserve