More function name documentation

SAT-R · Dec 30, 2024 · 65cc78e · 65cc78e
1 parent 065b21b
commit 65cc78e
Show file tree

Hide file tree

Showing 33 changed files with 169 additions and 156 deletions.
diff --git a/asm/enemy_fireball.s b/asm/enemy_fireball.s
@@ -298,7 +298,7 @@ _080710C8:
 	cmp r0, #0
 	beq _080710F2
 	adds r0, r6, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _080710F2:
 	movs r7, #0x3c
 	ldrsh r0, [r5, r7]
@@ -455,7 +455,7 @@ _0807120C:
 	cmp r0, #0
 	beq _08071236
 	adds r0, r6, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _08071236:
 	movs r7, #0x3c
 	ldrsh r1, [r5, r7]

diff --git a/asm/enemy_kiki.s b/asm/enemy_kiki.s
@@ -1048,7 +1048,7 @@ _0801DBFE:
 	blt _0801DC16
 _0801DC10:
 	mov r0, sl
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0801DC16:
 	ldr r2, _0801DC50 @ =gCamera
 	ldrh r0, [r4, #0x16]

diff --git a/asm/enemy_kuraa.s b/asm/enemy_kuraa.s
@@ -545,7 +545,7 @@ _08073910:
 	blt _08073928
 _08073922:
 	mov r0, sb
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _08073928:
 	mov r1, r8
 	adds r1, #0x42

diff --git a/asm/enemy_leon.s b/asm/enemy_leon.s
@@ -854,7 +854,7 @@ _0806F032:
 	blt _0806F04A
 _0806F044:
 	ldr r0, _0806F06C @ =gPlayer
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806F04A:
 	ldr r0, [sp, #0xc]
 	asrs r5, r0, #0x10

diff --git a/asm/enemy_mirror.s b/asm/enemy_mirror.s
@@ -351,7 +351,7 @@ _0806FD56:
 	blt _0806FD6E
 _0806FD68:
 	mov r0, sl
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806FD6E:
 	ldr r0, [r7, #0x3c]
 	asrs r2, r0, #8

diff --git a/asm/enemy_pierrot.s b/asm/enemy_pierrot.s
@@ -424,7 +424,7 @@ _0806DF9C:
 	b _0806DFB6
 _0806DFB0:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806DFB6:
 	ldr r2, [sp, #0x10]
 	asrs r1, r2, #0x10

diff --git a/asm/enemy_senbon.s b/asm/enemy_senbon.s
@@ -588,7 +588,7 @@ _08070E28:
 	blt _08070E40
 _08070E3A:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _08070E40:
 	mov r1, r8
 	adds r1, #0x44

diff --git a/asm/enemy_wamu.s b/asm/enemy_wamu.s
@@ -777,7 +777,7 @@ _0806F6FE:
 	blt _0806F716
 _0806F710:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806F716:
 	ldr r4, _0806F93C @ =0x000001C1
 	add r4, sb
@@ -915,7 +915,7 @@ _0806F80C:
 	blt _0806F824
 _0806F81E:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806F824:
 	ldr r4, _0806F93C @ =0x000001C1
 	add r4, sb
@@ -1065,7 +1065,7 @@ _0806F94C:
 	blt _0806F954
 _0806F94E:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806F954:
 	ldr r4, _0806FA74 @ =0x000001C1
 	add r4, sb
@@ -1204,7 +1204,7 @@ _0806FA4C:
 	blt _0806FA64
 _0806FA5E:
 	adds r0, r2, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0806FA64:
 	add sp, #0x1c
 	pop {r3, r4, r5}

diff --git a/asm/game_0.s b/asm/game_0.s
@@ -2126,8 +2126,11 @@ _0800A694:
 	pop {r1}
 	bx r1
 
-	thumb_func_start sub_800A6A4
-sub_800A6A4: @ 0x0800A6A4
+@ --- Start of game/sa1_sa2_shared/collision.c ---
+
+@ NOTE: parameters 1 and 2 are s16 in SA1, s32 in SA2!
+	thumb_func_start CheckRectCollision_SpritePlayer
+CheckRectCollision_SpritePlayer: @ 0x0800A6A4
 	push {r4, r5, r6, r7, lr}
 	mov r7, r8
 	push {r7}
@@ -4398,7 +4401,7 @@ _0800B742:
 _0800B764: .4byte gGameMode
 _0800B768:
 	adds r0, r7, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 _0800B76E:
 	ldr r1, [sp, #4]
 	adds r1, #1
@@ -4547,7 +4550,7 @@ _0800B86A:
 	blt _0800B886
 _0800B87C:
 	adds r0, r7, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #1
 	mov sb, r0
 _0800B886:
@@ -4790,7 +4793,7 @@ _0800BA32:
 	blt _0800BA4E
 _0800BA44:
 	adds r0, r3, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #2
 	b _0800BA50
 _0800BA4E:
@@ -5116,7 +5119,7 @@ _0800BC8E:
 	blt _0800BCAA
 _0800BCA0:
 	adds r0, r5, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #2
 	b _0800BCAC
 _0800BCAA:
@@ -5437,7 +5440,7 @@ _0800BEE6:
 	blt _0800BF02
 _0800BEF8:
 	adds r0, r3, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #2
 	b _0800BF04
 _0800BF02:
@@ -5555,7 +5558,7 @@ _0800BFC2:
 	blt _0800BFDE
 _0800BFD4:
 	adds r0, r6, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #2
 	b _0800BFE0
 _0800BFDE:
@@ -5679,7 +5682,7 @@ _0800C0B0:
 	cmp r0, #0xd
 	beq _0800C0C8
 	adds r0, r6, #0
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	b _0800C0CE
 	.align 2, 0
 _0800C0C4: .4byte gCurrentLevel
@@ -5941,7 +5944,7 @@ _0800C28E:
 	blt _0800C2AA
 _0800C2A0:
 	mov r0, r8
-	bl sub_800C558
+	bl sa2__sub_800CBA4
 	movs r0, #2
 	b _0800C2AC
 _0800C2AA:
@@ -6315,8 +6318,9 @@ _0800C548:
 	bx r1
 	.align 2, 0
 
-	thumb_func_start sub_800C558
-sub_800C558: @ 0x0800C558
+@ NOTE: Not a 1:1 match with SA2!
+	thumb_func_start sa2__sub_800CBA4
+sa2__sub_800CBA4: @ 0x0800C558
 	push {r4, r5, r6, r7, lr}
 	adds r4, r0, #0
 	movs r1, #0x1e
@@ -6485,7 +6489,7 @@ _0800C694:
 	ldr r1, [r4, #4]
 	asrs r1, r1, #8
 	adds r2, r5, #0
-	bl sub_8040B10
+	bl InitScatteringRings
 	ldr r0, _0800C6CC @ =gGameMode
 	ldrb r0, [r0]
 	cmp r0, #1
@@ -6541,6 +6545,7 @@ _0800C70C:
 	bx r1
 	.align 2, 0
 
+    @ TODO: Only in SA1?
 	thumb_func_start sub_800C714
 sub_800C714: @ 0x0800C714
 	push {lr}
@@ -6680,7 +6685,7 @@ _0800C808:
 	ldr r1, [r5, #4]
 	asrs r1, r1, #8
 	adds r2, r4, #0
-	bl sub_8040B10
+	bl InitScatteringRings
 	ldrh r0, [r6]
 	subs r0, r0, r4
 	strh r0, [r6]
@@ -6801,7 +6806,7 @@ _0800C8F6:
 	ldr r1, [r5, #4]
 	asrs r1, r1, #8
 	adds r2, r4, #0
-	bl sub_8040B10
+	bl InitScatteringRings
 	ldrh r0, [r6]
 	subs r0, r0, r4
 	strh r0, [r6]
@@ -7540,7 +7545,7 @@ sub_800CE34: @ 0x0800CE34
 	adds r1, r4, #0
 	adds r2, r5, #0
 	mov r3, r8
-	bl sub_800A6A4
+	bl CheckRectCollision_SpritePlayer
 	add sp, #0xc
 	pop {r3, r4}
 	mov r8, r3
@@ -7595,7 +7600,7 @@ sub_800CE98: @ 0x0800CE98
 	adds r1, r4, #0
 	adds r2, r5, #0
 	mov r3, r8
-	bl sub_800A6A4
+	bl CheckRectCollision_SpritePlayer
 	add sp, #0xc
 	pop {r3, r4}
 	mov r8, r3

diff --git a/asm/game_0_1.s b/asm/game_0_1.s
@@ -2892,10 +2892,10 @@ sub_800FCFC: @ 0x0800FCFC
 	push {lr}
 	ldr r3, _0800FD64 @ =gGameMode
 	movs r2, #6
-	ldr r0, _0800FD68 @ =gUnknown_03005A18
+	ldr r0, _0800FD68 @ =gRingsScatterTask
 	movs r1, #0
 	str r1, [r0]
-	ldr r0, _0800FD6C @ =gUnknown_030058BC
+	ldr r0, _0800FD6C @ =gSomeDebugTask
 	str r1, [r0]
 	ldr r0, _0800FD70 @ =gUnknown_030058C0
 	str r1, [r0]
@@ -2943,8 +2943,8 @@ _0800FD2A:
 	bx r0
 	.align 2, 0
 _0800FD64: .4byte gGameMode
-_0800FD68: .4byte gUnknown_03005A18
-_0800FD6C: .4byte gUnknown_030058BC
+_0800FD68: .4byte gRingsScatterTask
+_0800FD6C: .4byte gSomeDebugTask
 _0800FD70: .4byte gUnknown_030058C0
 _0800FD74: .4byte gPlayer
 _0800FD78: .4byte gPartner
@@ -12346,7 +12346,7 @@ _08014934:
 	str r3, [sp]
 	mov r0, sb
 	adds r3, r5, #0
-	bl sub_800A6A4
+	bl CheckRectCollision_SpritePlayer
 	cmp r0, #0
 	bne _08014954
 	b _08014A6A
@@ -19801,7 +19801,7 @@ sub_8018428: @ 0x08018428
 	ldrsh r1, [r0, r2]
 	ldrb r2, [r0, #0xf]
 	adds r0, r3, #0
-	bl sub_8040B10
+	bl InitScatteringRings
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -23580,7 +23580,7 @@ _0801A2EA:
 	str r0, [r1, #8]
 	ldr r0, [r1, #8]
 	movs r0, #1
-	bl sub_803A950
+	bl CreateChaoMessageMP
 	b _0801A36E
 	.align 2, 0
 _0801A32C: .4byte 0x0000FFFF