Commit (FireEmblemUniverse#467)

Co-authored-by: Veslyquix <[email protected]>
Huichelaar · Sep 22, 2023 · 097d474 · 097d474
1 parent c19e7ed
commit 097d474
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/EngineHacks/SkillSystem/Skills/StandaloneSkills/ShrewdPotential/ShrewdPotential.lyn.event b/EngineHacks/SkillSystem/Skills/StandaloneSkills/ShrewdPotential/ShrewdPotential.lyn.event
@@ -2,11 +2,11 @@ ALIGN 4
 PUSH
 ORG CURRENTOFFSET+$1;ShrewdPotential:
 POP
-WORD $1C05B420 $492D1C20
+WORD $1C05B520 $492E1C20
 SHORT $6809
 SHORT ((SkillTester-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((SkillTester-4-CURRENTOFFSET>>1)&$7FF)|$F800
 SHORT $1C29
-WORD $29002500 $4D2AD001 $1C08682D $29007801 $1949D000 $18897CA2 $780174A1 $D0002900 $7CE21949 $74E11889 $29007841 $1949D000 $18897D22 $78817521 $D0002900 $7D621949 $75611889 $290078C1 $1949D000 $18897DA2 $790175A1 $D0002900 $7DE21949 $75E11889 $29007941 $1949D000 $18897E22 $79817621 $D0002900 $7E621949 $76611889 $290079C1 $1949D000 $18897F62 $7A027761 $18527EA1 $1C2176A2 $780A313A $2B007A43 $195BD000 $700A18D2 $BC201C20 $47184B02
+WORD $28002500 $4D2BD001 $1C08682D $29007801 $1949D000 $18897CA2 $780174A1 $D0002900 $7CE21949 $74E11889 $29007841 $1949D000 $18897D22 $78817521 $D0002900 $7D621949 $75611889 $290078C1 $1949D000 $18897DA2 $790175A1 $D0002900 $7DE21949 $75E11889 $29007941 $1949D000 $18897E22 $79817621 $D0002900 $7E621949 $76611889 $290079C1 $1949D000 $18897F62 $7A027761 $18527EA1 $1C2176A2 $780A313A $2B007A43 $195BD000 $700A18D2 $BC201C20 $4B03BC08 $4718
 POIN ShrewdPotentialID_Link
 POIN ShrewdPotentialAmount_Link
 WORD $802F891
diff --git a/EngineHacks/SkillSystem/Skills/StandaloneSkills/ShrewdPotential/ShrewdPotential.s b/EngineHacks/SkillSystem/Skills/StandaloneSkills/ShrewdPotential/ShrewdPotential.s
@@ -10,7 +10,7 @@
 .global ShrewdPotential 
 .type ShrewdPotential, %function  
 ShrewdPotential: 
-push {r5} 
+push {r5, lr} 
 mov r5, r0 @ table of stat boosts to add to stats 
 
 mov r0, r4 @ unit 
@@ -19,7 +19,7 @@ ldr r1, [r1]
 bl SkillTester 
 mov r1, r5 @ table of stat boosts 
 mov r5, #0 
-cmp r1, #0 
+cmp r0, #0 
 beq NoBoost 
 ldr r5, =ShrewdPotentialAmount_Link 
 ldr r5, [r5] 
@@ -118,6 +118,7 @@ add		r2,r2,r3
 strb	r2,[r1]
 mov		r0,r4
 pop {r5} 
+pop {r3} 
 ldr r3, =Return 
 bx r3 
 .ltorg