Merge pull request #70 from AnonymousRandomPerson/main

Synced from pmdsky-debug
pret · Sep 8, 2024 · 5959cc9 · 5959cc9
2 parents 2ed173f + d64f910
commit 5959cc9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc
@@ -19,6 +19,7 @@
 .public CheckVariousStatuses
 .public CheckVariousStatuses2
 .public Conversion2IsActive
+.public CopySpawnEntriesMaster
 .public DeleteWanTableEntryVeneer
 .public DIRECTIONS_XY
 .public DirectoryFileMngr_GetDirectoryFileSize
@@ -140,7 +141,6 @@
 .public ov29_022E0A04
 .public ov29_022E1C0C
 .public ov29_022E2470
-.public ov29_022E2978
 .public ov29_022E2A78
 .public ov29_022E4160
 .public ov29_022E576C
@@ -149,7 +149,6 @@
 .public ov29_022E68BC
 .public ov29_022E68D8
 .public ov29_022E6928
-.public ov29_022E7BE8
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EA370
@@ -188,6 +187,7 @@
 .public ov29_02351E28
 .public ov29_0237C9B0
 .public PointCameraToMonster
+.public PopulateActiveMonsterPtrs
 .public RandInt
 .public RemoveEquivItem
 .public RemoveHolderForItemInBag

diff --git a/asm/include/overlay_30.inc b/asm/include/overlay_30.inc
@@ -17,13 +17,13 @@
 .public ov29_022E1C84
 .public ov29_022E1EC4
 .public ov29_022E2018
-.public ov29_022E2978
 .public ov29_022FB920
 .public ov29_023021F0
 .public ov29_02338768
 .public ov29_02338F24
 .public ov29_02344B1C
 .public ov29_02344B30
+.public PopulateActiveMonsterPtrs
 .public ReadQuickSaveInfo
 .public SpawnItem
 .public SpawnTrap

diff --git a/asm/overlay_29_022E1A40.s b/asm/overlay_29_022E1A40.s
@@ -357,7 +357,7 @@ _022E1D90:
 	strb r0, [r7, #0xb1]
 	strb r0, [r7, #0xb3]
 	str r1, [r7, #0x1c]
-	bl ov29_022E2978
+	bl PopulateActiveMonsterPtrs
 	ldr r1, [sp, #8]
 	ldr r0, [r7, #0xb4]
 #ifdef JAPAN
@@ -681,7 +681,7 @@ _022E211C:
 	mov r0, r0, lsr #0x10
 	mov r1, r1, lsr #0x10
 	bl ov29_022E1EC4
-	bl ov29_022E2978
+	bl PopulateActiveMonsterPtrs
 	ldr r1, _022E225C ; =DUNGEON_PTR
 	mov r0, r7
 	ldr r1, [r1]
@@ -1286,8 +1286,8 @@ CanTargetPosition: ; 0x022E2954
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end CanTargetPosition
 
-	arm_func_start ov29_022E2978
-ov29_022E2978: ; 0x022E2978
+	arm_func_start PopulateActiveMonsterPtrs
+PopulateActiveMonsterPtrs: ; 0x022E2978
 #ifdef JAPAN
 #define OV29_022E2978_OFFSET -0xA4
 #else
@@ -1346,7 +1346,7 @@ _022E2A28:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022E2A34: .word DUNGEON_PTR
-	arm_func_end ov29_022E2978
+	arm_func_end PopulateActiveMonsterPtrs
 
 	arm_func_start GetTeamMemberIndex
 GetTeamMemberIndex: ; 0x022E2A38

diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s
@@ -5502,8 +5502,8 @@ ov29_022E7BD0: ; 0x022E7BD0
 	ldmia sp!, {r3, pc}
 	arm_func_end ov29_022E7BD0
 
-	arm_func_start ov29_022E7BE8
-ov29_022E7BE8: ; 0x022E7BE8
+	arm_func_start CopySpawnEntriesMaster
+CopySpawnEntriesMaster: ; 0x022E7BE8
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r6, r0
 	mov r5, r1
@@ -5549,7 +5549,7 @@ _022E7C54:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022E7C5C: .word DUNGEON_PTR
-	arm_func_end ov29_022E7BE8
+	arm_func_end CopySpawnEntriesMaster
 
 	arm_func_start MonsterSpawnListPartialCopy
 MonsterSpawnListPartialCopy: ; 0x022E7C60
@@ -5643,7 +5643,7 @@ ov29_022E7CFC: ; 0x022E7CFC
 	add r0, r0, #0x174
 #endif
 	add r0, r0, #0x3800
-	bl ov29_022E7BE8
+	bl CopySpawnEntriesMaster
 	ldr r1, _022E7D48 ; =DUNGEON_PTR
 	ldr r1, [r1]
 	add r1, r1, #0x3000

diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s
@@ -1594,7 +1594,7 @@ _022F8594:
 	mov r1, #1
 	strb r1, [r0, #0xe]
 	str r2, [sl]
-	bl ov29_022E2978
+	bl PopulateActiveMonsterPtrs
 #ifdef EUROPE
 	mov r0, r5
 	mov r1, #0
@@ -6414,7 +6414,7 @@ InitEnemySpawnStats: ; 0x022FBF58
 	bl ov29_022FBF08
 	add r0, sp, #0x16
 	mov r1, #0
-	bl ov29_022E7BE8
+	bl CopySpawnEntriesMaster
 	mov r4, r0
 	mov r6, #0
 	b _022FC028

diff --git a/asm/overlay_30.s b/asm/overlay_30.s
@@ -3787,7 +3787,7 @@ ov30_023859DC: ; 0x023859DC
 	strb r1, [r6, #0xb1]
 	strb r1, [r6, #0xb3]
 	str r0, [r6, #0x1c]
-	bl ov29_022E2978
+	bl PopulateActiveMonsterPtrs
 	ldr r1, [sp, #8]
 	ldr r0, [r6, #0xb4]
 #ifdef JAPAN
@@ -3913,7 +3913,7 @@ ov30_02385B10: ; 0x02385B10
 	mov r0, r0, lsr #0x10
 	mov r1, r1, lsr #0x10
 	bl ov29_022E1EC4
-	bl ov29_022E2978
+	bl PopulateActiveMonsterPtrs
 	and r0, r5, #0xff
 	strb r5, [r6, #0xaa]
 	bl ov29_022DE9F8