Fix (#609)

Co-authored-by: Veslyquix <[email protected]>
FireEmblemUniverse · Apr 9, 2024 · 2a34a0a · 2a34a0a
1 parent 42e944f
commit 2a34a0a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/EngineHacks/Necessary/Debuffs/asm/SetDebuffs.lyn.event b/EngineHacks/Necessary/Debuffs/asm/SetDebuffs.lyn.event
@@ -2,34 +2,39 @@ ALIGN 4
 PUSH
 ORG CURRENTOFFSET+$25;ApplyWeaponDebuffs:
 POP
-SHORT $B501 $1C28 $1C21 $F000 $F80D $1C20 $1C29 $F000 $F809 $BC01 $40 $1C21 $311E $1840 $312A $8809 $BC04 $4710 $B5F0 $1C04 $1C0D
+WORD $1C28B501 $F0001C21 $1C20F80D $F0001C29 $BC01F809 $1C210040 $1840311E $8809312A $4710BC04 $1C04B5F0
+SHORT $1C0D
 SHORT ((GetUnitDebuffEntry-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((GetUnitDebuffEntry-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $1C06 $1C28
+SHORT $1C06
+SHORT $1C28
 SHORT ((GetUnitDebuffEntry-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((GetUnitDebuffEntry-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $1C07 $2048 $5A20 $F000 $F8AC $2800 $D028 $2180 $4208 $D005 $1C30 $4919 $6809
+SHORT $1C07
+WORD $5A202048 $F8ACF000 $D0282800 $42082180 $1C30D005 $68094919
 SHORT ((SetBit-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((SetBit-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $E004 $1C30 $4916 $6809
+WORD $1C30E004 $68094916
 SHORT ((UnsetBit-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((UnsetBit-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $2048 $5A20 $F000 $F898 $2140 $4208 $D005 $1C30 $4911 $6809
+WORD $5A202048 $F898F000 $42082140 $1C30D005 $68094911
 SHORT ((SetBit-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((SetBit-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $E004 $1C30 $490E $6809
+WORD $1C30E004 $6809490E
 SHORT ((UnsetBit-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((UnsetBit-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $2048 $5A20 $F000 $F886 $1C21 $1C32 $1C3B $F000 $F813 $2048 $5A28 $F000 $F87D $211F $4008 $1C29 $1C3A $1C33 $F000 $F808 $BCF0 $BC01 $4700
-BYTE $0 $0
+WORD $5A202048 $F886F000 $1C321C21 $F0001C3B $2048F813 $F0005A28 $211FF87D $1C294008 $1C331C3A $F808F000 $BC01BCF0 $4700
 POIN HalfStrBitOffset_Link
 POIN HalfMagBitOffset_Link
-SHORT $B5F0 $241F $4004 $207C $5C28 $4645 $B420 $1C0D $1C16 $1C1F $2101 $4008 $492C $6809 $2901 $D101 $2800 $D04D $4A2A $6811 $4688 $2240 $4B29 $E4 $18E4 $2500 $3D01 $3501 $4545 $DA41 $5D61 $2900 $D0F9 $1C30 $22C0 $4011 $2900 $D002 $29C0 $D000 $1C38 $4A21 $6812 $1C29 $4351
+WORD $241FB5F0 $46454004 $1C0DB420 $1C1F1C16 $5C28207C $40082101 $6809492C $D1012901 $D04D2800 $68114A2A $22404688 $E44B29 $250018E4 $35013D01 $DA414545 $29005D61 $1C30D0F9 $401122C0 $D0022900 $D00029C0 $4A211C38 $1C296812
+SHORT $4351
 SHORT ((UnpackData_Signed-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((UnpackData_Signed-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $2240 $5D61 $2900 $D0E7 $2980 $DA09 $1C0B $4393 $2800 $DA00 $4143 $4283 $DBDE $4211 $D00A $E011 $233F $400B $425B $2800 $DD00 $4143 $4283 $DCD3 $4211 $D007 $1C30 $4A10 $6812 $1C29 $4351
+SHORT $2240
+WORD $29005D61 $2980D0E7 $1C0BDA09 $28004393 $4143DA00 $DBDE4283 $D00A4211 $233FE011 $425B400B $DD002800 $42834143 $4211DCD3 $1C30D007 $68124A10 $43511C29
 SHORT ((PackData_Signed-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((PackData_Signed-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $E7C9 $1C38 $4A0C $6812 $1C29 $4351
+WORD $1C38E7C9 $68124A0C $43511C29
 SHORT ((PackData_Signed-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((PackData_Signed-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $1C38 $4A09 $6812 $1C29 $4351
+WORD $4A091C38 $1C296812
+SHORT $4351
 SHORT ((UnpackData_Signed-4-CURRENTOFFSET>>12)&$7FF)|$F000 ((UnpackData_Signed-4-CURRENTOFFSET>>1)&$7FF)|$F800
-SHORT $E7BA $BC20 $46A8 $BCF0 $BC01 $4700
-BYTE $0 $0
+SHORT $E7BA
+WORD $46A8BC20 $BC01BCF0 $4700
 POIN RequireDamageToDebuff_Link
 POIN DebuffNumberOfStats_Link
 POIN NewWeaponDebuffTable
 POIN DebuffStatNumberOfBits_Link
-SHORT $21FF $4008 $4A03 $2124 $4348 $1812 $2021 $5C10 $4770 $46C0
+WORD $400821FF $21244A03 $18124348 $5C102021 $46C04770
diff --git a/EngineHacks/Necessary/Debuffs/asm/SetDebuffs.s b/EngineHacks/Necessary/Debuffs/asm/SetDebuffs.s
@@ -129,8 +129,7 @@ push {r4-r7, lr}
 mov r4, #0x1f 
 and r4, r0 @ wep debuff entry 
 
-mov r0, #0x7C       @damage/hit data
-ldrb r0, [r5, r0] @ always called by ApplyWeaponDebuffs 
+
 
 mov r5, r8 
 push {r5} 
@@ -141,7 +140,8 @@ mov r5, r1 @ unit
 mov r6, r2 @ unitA debuff ram 
 mov r7, r3 @ unitB debuff ram 
 
-
+mov r0, #0x7C       @damage/hit data
+ldrb r0, [r5, r0] @ always called by ApplyWeaponDebuffs 
 mov r1, #0x1
 and r0, r1