Merge branch 'master' into tilemap-docs

asm/src/code_08000F10.s

@@ -10,41 +10,43 @@ CheckBits: @ 0x08000F10
 	ldr r3, _08000F50 @ =ram_CheckBits
 	bx r3
 
-	thumb_func_start sub_08000F14
-sub_08000F14: @ 0x08000F14
+	// sum 3 drop probability vectors
+	thumb_func_start SumDropProbabilities
+SumDropProbabilities: @ 0x08000F14
 	push {r4, r5, r6}
-	movs r4, #0x1e
+	movs r4, #30 // vector addition for 16 shorts in reverse
 _08000F18:
-	ldrsh r5, [r1, r4]
-	ldrsh r6, [r2, r4]
-	adds r5, r5, r6
-	ldrsh r6, [r3, r4]
-	adds r5, r5, r6
-	strh r5, [r0, r4]
+	ldrsh r5, [r1, r4] // row 1
+	ldrsh r6, [r2, r4] // + row 2
+	adds r5, r6
+	ldrsh r6, [r3, r4] // + row 3
+	adds r5, r6
+	strh r5, [r0, r4] // store in output
 	subs r4, #2
 	bpl _08000F18
 	pop {r4, r5, r6}
 	bx lr
 	
-	thumb_func_start sub_08000F2C
-sub_08000F2C: @ 0x08000F2C
+	// sum 3 drop probabilities, clamp to 0, return scalar sum
+	thumb_func_start SumDropProbabilities2
+SumDropProbabilities2: @ 0x08000F2C
 	push {r4, r5, r6, r7}
-	movs r4, #0x1e
-	movs r7, #0
+	movs r4, #30
+	movs r7, #0 // sum
 _08000F32:
-	ldrsh r5, [r1, r4]
-	ldrsh r6, [r2, r4]
-	adds r5, r5, r6
-	ldrsh r6, [r3, r4]
-	adds r5, r5, r6
-	bpl _08000F40
+	ldrsh r5, [r1, r4] // row 1
+	ldrsh r6, [r2, r4] // + row 2
+	adds r5, r6
+	ldrsh r6, [r3, r4] // + row 3
+	adds r5, r6
+	bpl positive_drop_chance // clamp to 0
 	movs r5, #0
-_08000F40:
-	strh r5, [r0, r4]
-	adds r7, r7, r5
+positive_drop_chance:
+	strh r5, [r0, r4] // store in output
+	adds r7, r5
 	subs r4, #2
 	bpl _08000F32
-	adds r0, r7, #0
+	adds r0, r7, #0 // return sum
 	pop {r4, r5, r6, r7}
 	bx lr
 	.align 2, 0

asm/src/enemy.s

@@ -18,7 +18,7 @@ EnemyUpdate: @ 0x080011C4
 	bne _080011EA
 	bl DeleteThisEntity
 _080011DC:
-	bl EntityIsDeleted
+	bl EntityDisabled
 	cmp r0, #0
 	bne _0800120A
 	adds r0, r4, #0

asm/src/projectileUpdate.s

@@ -18,7 +18,7 @@ ProjectileUpdate: @ 0x08016AE4
 	bne _08016B0A
 	bl DeleteThisEntity
 _08016AFC:
-	bl EntityIsDeleted
+	bl EntityDisabled
 	cmp r0, #0
 	bne _08016B22
 	adds r0, r4, #0