Merge pull request #66 from AnonymousRandomPerson/main

Synced from pmdsky-debug
pret · Jul 1, 2024 · d6758b7 · d6758b7
2 parents 575ab14 + 694eb3e
commit d6758b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc
@@ -41,11 +41,11 @@
 .public GetApparentWeather
 .public GetDamageSourceWrapper
 .public GetEffectAnimation
-.public GetLowKickMultiplier
 .public GetMoveAnimation
 .public GetMoveCategory
 .public GetMoveType
 .public GetTileAtEntity
+.public GetWeightMultiplier
 .public InitMove
 .public IRON_TAIL_LOWER_DEFENSE_CHANCE
 .public IsChargingTwoTurnMove

diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s
@@ -90797,8 +90797,8 @@ GetChanceAsleep: ; 0x020528E0
 _020528F8: .word _020B09B4
 	arm_func_end GetChanceAsleep
 
-	arm_func_start GetLowKickMultiplier
-GetLowKickMultiplier: ; 0x020528FC
+	arm_func_start GetWeightMultiplier
+GetWeightMultiplier: ; 0x020528FC
 	ldr r2, _02052914 ; =_020B09B4
 	mov r1, #0x44
 	ldr r2, [r2]
@@ -90807,7 +90807,7 @@ GetLowKickMultiplier: ; 0x020528FC
 	bx lr
 	.align 2, 0
 _02052914: .word _020B09B4
-	arm_func_end GetLowKickMultiplier
+	arm_func_end GetWeightMultiplier
 
 	arm_func_start GetSize
 GetSize: ; 0x02052918

diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s
@@ -2738,7 +2738,7 @@ DoMoveDamageWeightDependent: ; 0x023277B8
 	ldrsh r0, [r1, #4]
 	mov r5, r2
 	mov r4, r3
-	bl GetLowKickMultiplier
+	bl GetWeightMultiplier
 	mov r3, r0
 	mov r0, r7
 	mov r1, r6