Dump and document status sprites

pret · Dec 13, 2021 · 087405b · 087405b
1 parent 8213467
commit 087405b
Show file tree

Hide file tree

Showing 30 changed files with 543 additions and 328 deletions.
diff --git a/asm/code_800D090.s b/asm/code_800D090.s
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
@@ -3009,15 +3009,16 @@ _08041874: .4byte 0x00000808
 _08041878: .4byte gUnknown_203B40D
 	thumb_func_end sub_804178C
 
-	thumb_func_start sub_804187C
-sub_804187C:
+	thumb_func_start EntityGetStatusSprites
+    @ int EntityGetStatusSprites(struct DungeonEntity *entity)
+EntityGetStatusSprites:
 	ldr r0, [r0, 0x70]
 	movs r1, 0x80
 	lsls r1, 2
 	adds r0, r1
 	ldr r0, [r0]
 	bx lr
-	thumb_func_end sub_804187C
+	thumb_func_end EntityGetStatusSprites
 
 	thumb_func_start sub_8041888
 sub_8041888:
@@ -3048,7 +3049,7 @@ _08041890:
 	strb r0, [r1]
 _080418BA:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080418C0:
 	adds r5, 0x1
 	cmp r5, 0x13
@@ -3061,8 +3062,8 @@ _080418CC: .4byte gDungeonGlobalData
 _080418D0: .4byte 0x000135cc
 	thumb_func_end sub_8041888
 
-	thumb_func_start sub_80418D4
-sub_80418D4:
+	thumb_func_start DungeonEntityUpdateStatusSprites
+DungeonEntityUpdateStatusSprites:
 	push {r4,lr}
 	adds r4, r0, 0
 	bl EntityExists
@@ -3297,21 +3298,21 @@ _08041A8C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08041A94: .4byte gUnknown_80F669C
-_08041A98: .4byte gUnknown_80F66B4
-_08041A9C: .4byte gUnknown_80F66C8
-_08041AA0: .4byte gUnknown_80F66E8
-_08041AA4: .4byte gUnknown_80F6708
-_08041AA8: .4byte gUnknown_80F673C
-_08041AAC: .4byte gUnknown_80F6778
-_08041AB0: .4byte gUnknown_80F6788
-_08041AB4: .4byte gUnknown_80F6794
-_08041AB8: .4byte gUnknown_80F67A8
-_08041ABC: .4byte gUnknown_80F67B4
-_08041AC0: .4byte gUnknown_80F67C4
-_08041AC4: .4byte gUnknown_80F67D4
+_08041A94: .4byte gStatusSpriteMasks_SleepStatus
+_08041A98: .4byte gStatusSpriteMasks_NonVolatileStatus
+_08041A9C: .4byte gStatusSpriteMasks_ImmobilizeStatus
+_08041AA0: .4byte gStatusSpriteMasks_VolatileStatus
+_08041AA4: .4byte gStatusSpriteMasks_ChargingStatus
+_08041AA8: .4byte gStatusSpriteMasks_ProtectionStatus
+_08041AAC: .4byte gStatusSpriteMasks_WaitingStatus
+_08041AB0: .4byte gStatusSpriteMasks_LinkedStatus
+_08041AB4: .4byte gStatusSpriteMasks_MoveStatus
+_08041AB8: .4byte gStatusSpriteMasks_ItemStatus
+_08041ABC: .4byte gStatusSpriteMasks_TransformStatus
+_08041AC0: .4byte gStatusSpriteMasks_EyesightStatus
+_08041AC4: .4byte gStatusSpriteMasks_MuzzledStatus
 _08041AC8: .4byte gDungeonGlobalData
 _08041ACC: .4byte 0x00000676
-	thumb_func_end sub_80418D4
+	thumb_func_end DungeonEntityUpdateStatusSprites
 
         .align 2,0
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
@@ -1074,7 +1074,7 @@ _080432FC:
 	bl nullsub_16
 	bl sub_80521D0
 	bl sub_80531A8
-	bl sub_800F690
+	bl InitDungeonPokemonSprites
 	cmp r6, 0
 	bne _08043318
 	bl sub_804513C
@@ -1762,7 +1762,7 @@ _08043926:
 	ldr r0, _08043994
 	ldr r0, [r0]
 	bl CloseFile
-	bl sub_800F740
+	bl FreeDungeonPokemonSprites
 	ldr r0, _08043998
 	mov r3, r10
 	strb r3, [r0]

diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s
@@ -170,15 +170,15 @@ _08045284: .4byte 0x000181f8
 _08045288:
 	ldr r4, [r5, 0x70]
 	adds r0, r5, 0
-	bl sub_804187C
+	bl EntityGetStatusSprites
 	adds r2, r0, 0
 	adds r0, r4, 0
 	adds r0, 0x98
 	ldr r0, [r0]
 	movs r3, 0x4
 	ldrsh r1, [r4, r3]
 	movs r3, 0
-	bl sub_800F75C
+	bl UpdateDungeonPokemonSprite
 _080452A2:
 	adds r6, 0x1
 	cmp r6, 0x13

diff --git a/asm/code_8057824.s b/asm/code_8057824.s
@@ -35247,7 +35247,7 @@ _08069462:
 _08069466:
 	mov r1, r10
 	ldr r0, [r1]
-	bl sub_800F934
+	bl DeletePokemonDungeonSprite
 	ldr r0, _080694BC
 	movs r2, 0
 	str r2, [r0]
@@ -37746,7 +37746,7 @@ _0806A744:
 	cmp r0, 0
 	beq _0806A776
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	b _0806A776
 	.align 2, 0
 _0806A75C: .4byte gDungeonGlobalData
@@ -40398,7 +40398,7 @@ sub_806BB6C:
 	mov r8, r9
 	adds r0, 0x98
 	ldr r0, [r0]
-	bl sub_800F934
+	bl DeletePokemonDungeonSprite
 	add r0, sp, 0x8
 	movs r1, 0
 	mov r10, r1
@@ -40494,7 +40494,7 @@ _0806BC14:
 	adds r0, r7, 0
 	bl sub_80429E8
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	add sp, 0x1C
 	pop {r3-r5}
 	mov r8, r3
@@ -40901,7 +40901,7 @@ _0806BF70:
 	ldr r4, _0806BFBC
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_800F8D0
+	bl AddPokemonDungeonSprite
 	mov r0, r8
 	bl LoadIQSkills
 	mov r0, r8
@@ -42175,7 +42175,7 @@ _0806C904:
 	add r2, sp, 0xC
 	bl sub_800F958
 	adds r0, r6, 0
-	bl sub_804187C
+	bl EntityGetStatusSprites
 	adds r2, r0, 0
 	ldr r4, [r4]
 	mov r0, r8
@@ -42195,7 +42195,7 @@ _0806C904:
 _0806C958:
 	adds r0, r4, 0
 	adds r1, r7, 0
-	bl sub_800F75C
+	bl UpdateDungeonPokemonSprite
 	adds r0, r6, 0
 	mov r1, r9
 	bl sub_8042EC8

diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s
@@ -1919,7 +1919,7 @@ _0806DDA2:
 	adds r0, r7, 0
 	bl sub_806CCB4
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	ldr r4, _0806DDF0
 	adds r0, r4, 0
 	adds r1, r7, 0
@@ -2080,7 +2080,7 @@ _0806DEF2:
 	adds r0, r7, 0
 	bl sub_806CCB4
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	ldr r0, _0806DF40
 	adds r1, r7, 0
 	movs r2, 0