Merge pull request #299 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/main_02048764.inc

@@ -5,6 +5,7 @@
 .public _020A28A8
 .public _020AFF00
 .public _020AFF14
+.public AddUniqueStarterMoveTo
 .public ApplyLevelUpBoostsToGroundMonster
 .public DEFAULT_HERO_ID
 .public EnableAllLearnableIqSkills
@@ -32,5 +33,4 @@
 .public sub_02048C0C
 .public sub_02048C3C
 .public sub_02048C4C
-.public sub_02053568
 .public sub_02055B78

asm/include/main_02052B44.inc

@@ -6,7 +6,6 @@
 .public _020A3210
 .public _020A322C
 .public _020A3248
-.public _020A3258
 .public _020A327C
 .public _020A328C
 .public _020A32D4
@@ -67,6 +66,7 @@
 .public RemoveActiveMembersFromRescueTeam
 .public RemoveActiveMembersFromSpecialEpisodeTeam
 .public SprintfStatic__02052418
+.public STARTER_MOVES_ARRAY
 .public StrcpyName
 .public StrncmpSimple
 .public StrncpyName

asm/include/overlay_29_02311C28.inc

@@ -37,11 +37,11 @@
 .public ov29_022E4B8C
 .public ov29_022E4BA0
 .public ov29_022E4BB4
-.public ov29_022E4C00
 .public ov29_022E4C4C
 .public ov29_022E4D24
 .public ov29_022E53EC
 .public PETRIFIED_TURN_RANGE
+.public PlayAttractHitEffect
 .public PLAYER_PETRIFIED_TURN_RANGE
 .public POISONED_TURN_RANGE
 .public SafeguardIsActive

asm/main_02048764.s

@@ -94,7 +94,7 @@ _02048828:
 	mov r2, #0
 	bl ApplyLevelUpBoostsToGroundMonster
 	mov r0, r4
-	bl sub_02053568
+	bl AddUniqueStarterMoveTo
 	mov r4, #1
 _02048898:
 	bl GetPartnerMemberIdx
@@ -123,7 +123,7 @@ _02048898:
 	mov r2, #0
 	bl ApplyLevelUpBoostsToGroundMonster
 	mov r0, r4
-	bl sub_02053568
+	bl AddUniqueStarterMoveTo
 	mov r4, #1
 _02048908:
 	cmp r4, #0

asm/main_02052B44.s

@@ -786,11 +786,11 @@ _0205351C:
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end sub_020534BC
 
-	arm_func_start sub_02053568
+	arm_func_start AddUniqueStarterMoveTo
-sub_02053568: ; 0x02053568
+AddUniqueStarterMoveTo: ; 0x02053568
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
-	ldr r4, _0205361C ; =_020A3258
+	ldr r4, _0205361C ; =STARTER_MOVES_ARRAY
 	b _0205358C
 _02053578:
 	ldrsh r1, [r5, #4]
@@ -838,10 +838,10 @@ _02053604:
 	bl GetInfoMoveGround
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_0205361C: .word _020A3258
+_0205361C: .word STARTER_MOVES_ARRAY
 _02053620: .word 0x0000013B
 _02053624: .word _020A32D4
-	arm_func_end sub_02053568
+	arm_func_end AddUniqueStarterMoveTo
 
 	arm_func_start sub_02053628
 sub_02053628: ; 0x02053628

asm/main_rodata_020A2808.s

@@ -602,8 +602,8 @@ _020A3248:
 	.word sub_02054844
 	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
-	.global _020A3258
+	.global STARTER_MOVES_ARRAY
-_020A3258:
+STARTER_MOVES_ARRAY:
 	.byte 0x25, 0x00, 0xA7, 0x00, 0x85, 0x00, 0x79, 0x00, 0x02, 0x01, 0x5D, 0x00
 	.byte 0xB6, 0x01, 0xBE, 0x00, 0xE9, 0x01, 0x3F, 0x00, 0x34, 0x00, 0x6F, 0x00, 0xE8, 0x01, 0xD9, 0x01
 	.byte 0x48, 0x01, 0xD9, 0x01, 0x00, 0x00, 0x00, 0x00

asm/overlay_29_022E4BB4.s

@@ -26,8 +26,8 @@ ov29_022E4BB4: ; 0x022E4BB4
 	ldmia sp!, {r4, pc}
 	arm_func_end ov29_022E4BB4
 
-	arm_func_start ov29_022E4C00
+	arm_func_start PlayAttractHitEffect
-ov29_022E4C00: ; 0x022E4C00
+PlayAttractHitEffect: ; 0x022E4C00
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #0x10
 	mov r4, r0
@@ -47,7 +47,7 @@ ov29_022E4C00: ; 0x022E4C00
 	bl PlayEffectAnimationEntity
 	add sp, sp, #0x10
 	ldmia sp!, {r4, pc}
-	arm_func_end ov29_022E4C00
+	arm_func_end PlayAttractHitEffect
 
 	arm_func_start ov29_022E4C4C
 ov29_022E4C4C: ; 0x022E4C4C

asm/overlay_29_02311C28.s

@@ -537,7 +537,7 @@ _02312260:
 	add r1, r0, #1
 	mov r0, r4
 	strb r1, [r6, #0xd1]
-	bl ov29_022E4C00
+	bl PlayAttractHitEffect
 	ldr r2, _02312330 ; =0x00000D1A
 	mov r0, r5
 	mov r1, r4