rename rom_803BA2C.s to calculate_base_damage.s

4 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index c38f0b0f6..80ecf8dac 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ C_OBJS := $(C_SRCS:%.c=%.o)
 
 ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o asm/rom5_part2.o asm/rom6.o\
 asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o \
-asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/rom_803BA2C.o \
+asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/calculate_base_damage.o \
 asm/rom_813BA94.o asm/rom_81258BC.o asm/mystery_event_script.o \
 asm/field_effect_helpers.o asm/contest_ai.o asm/berry.o asm/rom_80B5054.o \
 asm/party_menu.o asm/rom_806D7F8.o
diff --git a/asm/rom_803BA2C.s b/asm/calculate_base_damage.s
index 68c57f8a3..06d2871bd 100644
--- a/asm/rom_803BA2C.s
+++ b/asm/calculate_base_damage.s
@@ -6,8 +6,8 @@
 
 	.text
 
-	thumb_func_start sub_803BA2C
-sub_803BA2C: @ 803BA2C
+	thumb_func_start CalculateBaseDamage
+CalculateBaseDamage: @ 803BA2C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1160,6 +1160,6 @@ _0803C330:
 	bx r1
 	.align 2, 0
 _0803C344: .4byte 0x02017100
-	thumb_func_end sub_803BA2C
+	thumb_func_end CalculateBaseDamage
 
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/rom3.s b/asm/rom3.s
index cced0538f..c00ae23e2 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -24358,7 +24358,7 @@ _08017CB8:
 	adds r0, r1, 0
 	movs r2, 0x1
 	movs r3, 0
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldr r1, _08017D10
 	str r0, [r1]
 	ldr r0, _08017D14
@@ -31846,7 +31846,7 @@ _0801BBE0:
 	adds r0, r1, 0
 	movs r2, 0x1
 	movs r3, 0
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldr r1, _0801BC3C
 	str r0, [r1]
 	ldr r1, _0801BC40
@@ -33607,7 +33607,7 @@ atk05_cmd5: @ 801C9EC
 	str r4, [sp, 0x8]
 	ldrb r4, [r6]
 	str r4, [sp, 0xC]
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldr r4, _0801CADC
 	ldr r1, _0801CAE0
 	ldrb r1, [r1]
@@ -33727,7 +33727,7 @@ sub_801CAF8: @ 801CAF8
 	str r4, [sp, 0x4]
 	str r7, [sp, 0x8]
 	str r5, [sp, 0xC]
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldr r4, _0801CBD4
 	movs r1, 0
 	mov r2, r8
@@ -51767,7 +51767,7 @@ _08025C1C:
 	str r4, [sp, 0x8]
 	ldrb r4, [r5]
 	str r4, [sp, 0xC]
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldrb r2, [r6]
 	lsls r1, r2, 3
 	subs r1, r2
@@ -59477,7 +59477,7 @@ _08029964:
 	str r4, [sp, 0x8]
 	ldrb r4, [r7]
 	str r4, [sp, 0xC]
-	bl sub_803BA2C
+	bl CalculateBaseDamage
 	ldrb r1, [r7]
 	lsls r1, 2
 	mov r2, r8
diff --git a/ld_script.txt b/ld_script.txt
index 9cbed71a7..9fb8f8118 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -48,7 +48,7 @@ SECTIONS {
         src/main_menu.o(.text);
         asm/rom3.o(.text);
         src/pokemon_1.o(.text);
-        asm/rom_803BA2C.o(.text);
+        asm/calculate_base_damage.o(.text);
         src/pokemon_2.o(.text);
         asm/rom_803D1FC.o(.text);
         src/trig.o(.text);