Merge pull request #214 from DizzyEggg/code_806CD90

code_806CD90
pret · Sep 18, 2024 · 05436da · 05436da
2 parents 5bb84ee + 3ee1739
commit 05436da
Show file tree

Hide file tree

Showing 19 changed files with 872 additions and 2,186 deletions.
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
@@ -6018,7 +6018,7 @@ _08055790:
 	adds r1, r4, 0
 	mov r2, r8
 	mov r3, r10
-	bl sub_806D010
+	bl HandleDealingDamage
 	b _08055826
 	.align 2, 0
 _080557AC: .4byte gDungeon
@@ -6139,7 +6139,7 @@ sub_8055864:
 	adds r1, r7, 0
 	add r2, sp, 0x10
 	movs r3, 0
-	bl sub_806D010
+	bl HandleDealingDamage
 	add r0, sp, 0x10
 	ldrb r0, [r0, 0xF]
 	cmp r0, 0
@@ -8611,7 +8611,7 @@ _08056C5A:
 	bl GetMoveType
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8092354
+	bl IsTypePhysical
 	movs r1, 0
 	lsls r0, 24
 	cmp r0, 0