From 087405b9d975b447ef7b17afd1e73e449cc7881b Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 13 Dec 2021 15:09:53 +0100
Subject: [PATCH] Dump and document status sprites

---
 asm/code_800D090.s                | 180 ++++++++++++++-------------
 asm/code_8040094.s                |  41 +++---
 asm/code_80428A0.s                |   4 +-
 asm/code_80450F8.s                |   4 +-
 asm/code_8057824.s                |  14 +--
 asm/code_806CD90.s                |   4 +-
 asm/code_8075BA4.s                | 200 +++++++++++++++---------------
 data/data_80B9BB8.s               |  73 ++++++++++-
 data/data_80F4278.s               | 161 ++++++++++++++++--------
 graphics/status/blinker.png       | Bin 0 -> 217 bytes
 graphics/status/burned.png        | Bin 0 -> 527 bytes
 graphics/status/confused.png      | Bin 0 -> 471 bytes
 graphics/status/cross_eyed.png    | Bin 0 -> 398 bytes
 graphics/status/eyedrops.png      | Bin 0 -> 269 bytes
 graphics/status/frozen.png        | Bin 0 -> 1126 bytes
 graphics/status/lowhp.png         | Bin 0 -> 245 bytes
 graphics/status/muzzled.png       | Bin 0 -> 242 bytes
 graphics/status/poisoned.png      | Bin 0 -> 403 bytes
 graphics/status/shield.png        | Bin 0 -> 472 bytes
 graphics/status/sleep.png         | Bin 0 -> 352 bytes
 graphics/status/sleepless.png     | Bin 0 -> 214 bytes
 graphics/status/statdown.png      | Bin 0 -> 322 bytes
 graphics/status/sword.png         | Bin 0 -> 380 bytes
 graphics/status/taunted.png       | Bin 0 -> 603 bytes
 graphics/status/whiffer.png       | Bin 0 -> 376 bytes
 include/constants/status.h        | 147 ++++++++++++++--------
 include/dungeon_entity.h          |   4 +-
 include/dungeon_global_data.h     |   6 +-
 include/dungeon_pokemon_sprites.h |  39 ++++++
 sym_ewram2.txt                    |   2 +-
 30 files changed, 547 insertions(+), 332 deletions(-)
 create mode 100644 graphics/status/blinker.png
 create mode 100644 graphics/status/burned.png
 create mode 100644 graphics/status/confused.png
 create mode 100644 graphics/status/cross_eyed.png
 create mode 100644 graphics/status/eyedrops.png
 create mode 100644 graphics/status/frozen.png
 create mode 100644 graphics/status/lowhp.png
 create mode 100644 graphics/status/muzzled.png
 create mode 100644 graphics/status/poisoned.png
 create mode 100644 graphics/status/shield.png
 create mode 100644 graphics/status/sleep.png
 create mode 100644 graphics/status/sleepless.png
 create mode 100644 graphics/status/statdown.png
 create mode 100644 graphics/status/sword.png
 create mode 100644 graphics/status/taunted.png
 create mode 100644 graphics/status/whiffer.png
 create mode 100644 include/dungeon_pokemon_sprites.h

diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index 5cc35f6b..505b5e1c 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -4407,8 +4407,9 @@ sub_800F204:
 	bx r0
 	thumb_func_end sub_800F204
 
-	thumb_func_start sub_800F210
-sub_800F210:
+	thumb_func_start GetDungeonPokemonSprite
+    @ struct DungeonPokemonSprite *GetDungeonPokemonSprite(int id)
+GetDungeonPokemonSprite:
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r3, 0
@@ -4427,7 +4428,7 @@ _0800F220:
 	adds r0, r1, 0
 	b _0800F240
 	.align 2, 0
-_0800F230: .4byte gUnknown_203B0D8
+_0800F230: .4byte gDungeonPokemonSprites
 _0800F234:
 	adds r1, 0x40
 	adds r2, 0x40
@@ -4439,10 +4440,11 @@ _0800F240:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800F210
+	thumb_func_end GetDungeonPokemonSprite
 
-	thumb_func_start sub_800F248
-sub_800F248:
+	thumb_func_start NewDungeonPokemonSprite
+    @ struct DungeonPokemonSprite *NewDungeonPokemonSprite(void)
+NewDungeonPokemonSprite:
 	push {lr}
 	movs r2, 0
 	ldr r0, _0800F25C
@@ -4455,7 +4457,7 @@ _0800F252:
 	adds r0, r1, 0
 	b _0800F26A
 	.align 2, 0
-_0800F25C: .4byte gUnknown_203B0D8
+_0800F25C: .4byte gDungeonPokemonSprites
 _0800F260:
 	adds r1, 0x40
 	adds r2, 0x1
@@ -4465,10 +4467,14 @@ _0800F260:
 _0800F26A:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800F248
+	thumb_func_end NewDungeonPokemonSprite
 
-	thumb_func_start sub_800F270
-sub_800F270:
+	thumb_func_start GetNextStatusSymbol
+    @ u32 GetNextStatusSymbol(?, int select)
+    @ The "select" parameter exists to differentiate between the two kinds of
+    @ status symbols that can appear at the same time.
+    @ Only frozen falls under select = 1, every other symbol falls under select = 0
+GetNextStatusSymbol:
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	lsls r0, r1, 3
@@ -4529,10 +4535,10 @@ _0800F2CE:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800F270
+	thumb_func_end GetNextStatusSymbol
 
-	thumb_func_start sub_800F2D4
-sub_800F2D4:
+	thumb_func_start StatusSymbolBitToIndex
+StatusSymbolBitToIndex:
 	push {lr}
 	movs r1, 0
 	cmp r0, 0
@@ -4546,7 +4552,7 @@ _0800F2E4:
 	adds r0, r1, 0
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800F2D4
+	thumb_func_end StatusSymbolBitToIndex
 
 	thumb_func_start sub_800F2EC
 sub_800F2EC:
@@ -4574,7 +4580,7 @@ _0800F30E:
 	bgt _0800F32A
 	adds r0, r5, 0
 	adds r1, r6, 0
-	bl sub_800F270
+	bl GetNextStatusSymbol
 	adds r1, r0, 0
 	ldr r0, [r4]
 	cmp r0, r1
@@ -4593,7 +4599,7 @@ _0800F32C:
 	ldr r0, [r4]
 	cmp r0, 0
 	beq _0800F35C
-	bl sub_800F2D4
+	bl StatusSymbolBitToIndex
 	adds r1, r0, 0
 	movs r2, 0x8
 	ldrsh r0, [r5, r2]
@@ -4607,7 +4613,7 @@ _0800F32C:
 	str r4, [sp, 0x4]
 	ldr r4, [r5, 0x4]
 	str r4, [sp, 0x8]
-	bl sub_800F364
+	bl DrawStatusSprite
 _0800F35C:
 	add sp, 0xC
 	pop {r4-r7}
@@ -4615,8 +4621,9 @@ _0800F35C:
 	bx r0
 	thumb_func_end sub_800F2EC
 
-	thumb_func_start sub_800F364
-sub_800F364:
+	thumb_func_start DrawStatusSprite
+    @ void DrawStatusSprite(?, int status, struct Position *pos, struct Position *pos_offset, struct Position *pos_screen, ?)
+DrawStatusSprite:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -4708,7 +4715,7 @@ _0800F404:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_0800F410: .4byte gUnknown_80D3474
+_0800F410: .4byte gStatusSprites
 _0800F414: .4byte gStatusGraphics
 _0800F418: .4byte 0x0000032b
 _0800F41C: .4byte gUnknown_203B0DC
@@ -4929,10 +4936,10 @@ _0800F5F0: .4byte 0x00003fff
 _0800F5F4: .4byte 0x000001ff
 _0800F5F8: .4byte 0x00000fff
 _0800F5FC: .4byte 0x000003ff
-	thumb_func_end sub_800F364
+	thumb_func_end DrawStatusSprite
 
-	thumb_func_start sub_800F600
-sub_800F600:
+	thumb_func_start LoadStatusGraphics
+LoadStatusGraphics:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -4982,7 +4989,7 @@ _0800F63C:
 	.align 2, 0
 _0800F660: .4byte gStatusGraphics
 _0800F664: .4byte 0x0000032b
-_0800F668: .4byte gUnknown_203B0D8
+_0800F668: .4byte gDungeonPokemonSprites
 _0800F66C: .4byte gStatusGraphics4bpp
 _0800F670: .4byte 0x06010000
 _0800F674:
@@ -4999,10 +5006,10 @@ _0800F67E:
 	bx r0
 	.align 2, 0
 _0800F68C: .4byte 0x06010000
-	thumb_func_end sub_800F600
+	thumb_func_end LoadStatusGraphics
 
-	thumb_func_start sub_800F690
-sub_800F690:
+	thumb_func_start InitDungeonPokemonSprites
+InitDungeonPokemonSprites:
 	push {r4,r5,lr}
 	ldr r5, _0800F738
 	ldr r0, [r5]
@@ -5021,62 +5028,62 @@ _0800F6AC:
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x2
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x3
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x4
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x5
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x6
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x7
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x8
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x9
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xA
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xB
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xC
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xD
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xE
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xF
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x10
 	movs r1, 0
-	bl sub_800F600
+	bl LoadStatusGraphics
 	pop {r4,r5}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F738: .4byte gUnknown_203B0D8
+_0800F738: .4byte gDungeonPokemonSprites
 _0800F73C: .4byte 0x00000584
-	thumb_func_end sub_800F690
+	thumb_func_end InitDungeonPokemonSprites
 
-	thumb_func_start sub_800F740
-sub_800F740:
+	thumb_func_start FreeDungeonPokemonSprites
+FreeDungeonPokemonSprites:
 	push {r4,lr}
 	ldr r4, _0800F758
 	ldr r0, [r4]
@@ -5090,11 +5097,12 @@ _0800F752:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F758: .4byte gUnknown_203B0D8
-	thumb_func_end sub_800F740
+_0800F758: .4byte gDungeonPokemonSprites
+	thumb_func_end FreeDungeonPokemonSprites
 
-	thumb_func_start sub_800F75C
-sub_800F75C:
+	thumb_func_start UpdateDungeonPokemonSprite
+    @ void UpdateDungeonPokemonSprite(int id, short species, int status, char visible)
+UpdateDungeonPokemonSprite:
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r7, r2, 0
@@ -5107,7 +5115,7 @@ sub_800F75C:
 	cmp r0, 0
 	beq _0800F788
 	adds r0, r4, 0
-	bl sub_800F210
+	bl GetDungeonPokemonSprite
 	cmp r0, 0
 	beq _0800F788
 	movs r1, 0
@@ -5121,8 +5129,8 @@ _0800F788:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F790: .4byte gUnknown_203B0D8
-	thumb_func_end sub_800F75C
+_0800F790: .4byte gDungeonPokemonSprites
+	thumb_func_end UpdateDungeonPokemonSprite
 
 	thumb_func_start sub_800F794
 sub_800F794:
@@ -5136,7 +5144,7 @@ sub_800F794:
 	cmp r0, 0
 	beq _0800F7C6
 	adds r0, r1, 0
-	bl sub_800F210
+	bl GetDungeonPokemonSprite
 	adds r2, r0, 0
 	cmp r2, 0
 	beq _0800F7C6
@@ -5155,7 +5163,7 @@ _0800F7C6:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F7CC: .4byte gUnknown_203B0D8
+_0800F7CC: .4byte gDungeonPokemonSprites
 	thumb_func_end sub_800F794
 
 	thumb_func_start sub_800F7D0
@@ -5185,7 +5193,7 @@ _0800F7EA:
 	beq _0800F80E
 	b _0800F888
 	.align 2, 0
-_0800F800: .4byte gUnknown_203B0D8
+_0800F800: .4byte gDungeonPokemonSprites
 _0800F804:
 	cmp r0, 0x2
 	beq _0800F846
@@ -5195,55 +5203,55 @@ _0800F804:
 _0800F80E:
 	movs r0, 0x1
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x2
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x3
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x4
 	b _0800F860
 _0800F82A:
 	movs r0, 0x5
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x6
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x7
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x8
 	b _0800F860
 _0800F846:
 	movs r0, 0x9
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xA
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xB
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xC
 _0800F860:
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	b _0800F888
 _0800F868:
 	movs r0, 0xD
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xE
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0xF
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 	movs r0, 0x10
 	movs r1, 0x1
-	bl sub_800F600
+	bl LoadStatusGraphics
 _0800F888:
 	movs r5, 0
 	movs r6, 0x4
@@ -5280,11 +5288,12 @@ _0800F8C0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F8CC: .4byte gUnknown_203B0D8
+_0800F8CC: .4byte gDungeonPokemonSprites
 	thumb_func_end sub_800F7D0
 
-	thumb_func_start sub_800F8D0
-sub_800F8D0:
+	thumb_func_start AddPokemonDungeonSprite
+    @ void AddPokemonDungeonSprite(int id, short species, struct Position *pos, ?)
+AddPokemonDungeonSprite:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -5298,11 +5307,11 @@ sub_800F8D0:
 	cmp r0, 0
 	beq _0800F920
 	adds r0, r5, 0
-	bl sub_800F210
+	bl GetDungeonPokemonSprite
 	adds r4, r0, 0
 	cmp r4, 0
 	bne _0800F920
-	bl sub_800F248
+	bl NewDungeonPokemonSprite
 	adds r1, r0, 0
 	cmp r1, 0
 	beq _0800F920
@@ -5330,12 +5339,13 @@ _0800F920:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F92C: .4byte gUnknown_203B0D8
+_0800F92C: .4byte gDungeonPokemonSprites
 _0800F930: .4byte gUnknown_80D3564
-	thumb_func_end sub_800F8D0
+	thumb_func_end AddPokemonDungeonSprite
 
-	thumb_func_start sub_800F934
-sub_800F934:
+	thumb_func_start DeletePokemonDungeonSprite
+    @ void DeletePokemonDungeonSprite(int id)
+DeletePokemonDungeonSprite:
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, _0800F954
@@ -5343,7 +5353,7 @@ sub_800F934:
 	cmp r0, 0
 	beq _0800F950
 	adds r0, r1, 0
-	bl sub_800F210
+	bl GetDungeonPokemonSprite
 	cmp r0, 0
 	beq _0800F950
 	movs r1, 0x40
@@ -5352,8 +5362,8 @@ _0800F950:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F954: .4byte gUnknown_203B0D8
-	thumb_func_end sub_800F934
+_0800F954: .4byte gDungeonPokemonSprites
+	thumb_func_end DeletePokemonDungeonSprite
 
 	thumb_func_start sub_800F958
 sub_800F958:
@@ -5367,7 +5377,7 @@ sub_800F958:
 	cmp r0, 0
 	beq _0800F984
 	adds r0, r4, 0
-	bl sub_800F210
+	bl GetDungeonPokemonSprite
 	adds r3, r0, 0
 	cmp r3, 0
 	beq _0800F984
@@ -5383,7 +5393,7 @@ _0800F984:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800F98C: .4byte gUnknown_203B0D8
+_0800F98C: .4byte gDungeonPokemonSprites
 	thumb_func_end sub_800F958
 
 	thumb_func_start sub_800F990
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
index 34ae1631..6148e19d 100644
--- 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
index 3146edd1..321afa0f 100644
--- 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
index 53a6e20f..98b4b011 100644
--- a/asm/code_80450F8.s
+++ b/asm/code_80450F8.s
@@ -170,7 +170,7 @@ _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
@@ -178,7 +178,7 @@ _08045288:
 	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
index c623f0d8..0134a510 100644
--- 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
index 50f101b1..6eff73f9 100644
--- 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
diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s
index 90e81966..9c0d0daf 100644
--- a/asm/code_8075BA4.s
+++ b/asm/code_8075BA4.s
@@ -54,7 +54,7 @@ _08075C48:
 	movs r7, 0x2
 _08075C4A:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	adds r0, r7, 0
 _08075C52:
 	pop {r4-r7}
@@ -321,7 +321,7 @@ _08075E50:
 	bl sub_80522F4
 _08075E5C:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08075E62:
 	pop {r3,r4}
 	mov r8, r3
@@ -419,7 +419,7 @@ _08075F10:
 	bl sub_80522F4
 _08075F1C:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08075F22:
 	pop {r3,r4}
 	mov r8, r3
@@ -502,7 +502,7 @@ _08075FB0:
 	bl sub_80522F4
 _08075FBC:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08075FC2:
 	pop {r4-r6}
 	pop {r0}
@@ -596,7 +596,7 @@ _08076074:
 	bl sub_80522F4
 _08076080:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076086:
 	pop {r4-r7}
 	pop {r0}
@@ -687,7 +687,7 @@ _08076128:
 	bl sub_80522F4
 _08076134:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807613A:
 	pop {r3,r4}
 	mov r8, r3
@@ -780,7 +780,7 @@ _080761F4:
 	bl sub_80522F4
 _08076200:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076206:
 	pop {r4-r7}
 	pop {r0}
@@ -940,7 +940,7 @@ _08076338:
 	bl sub_80522F4
 _08076344:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	adds r0, r5, 0
 	movs r1, 0x19
 	bl HasAbility
@@ -1241,7 +1241,7 @@ _080765B4:
 	ble _08076544
 _080765BA:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080765C0:
 	pop {r3-r5}
 	mov r8, r3
@@ -1464,7 +1464,7 @@ _08076784:
 	ble _08076714
 _0807678A:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076790:
 	pop {r3-r5}
 	mov r8, r3
@@ -1609,7 +1609,7 @@ _08076892:
 	adds r1, r5, 0
 	bl sub_80522F4
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080768C8:
 	pop {r3}
 	mov r8, r3
@@ -1724,7 +1724,7 @@ _080769AC:
 	bl sub_80522F4
 _080769B8:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080769BE:
 	pop {r3}
 	mov r8, r3
@@ -1828,7 +1828,7 @@ _08076A88:
 	bl sub_80522F4
 _08076A94:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076A9A:
 	pop {r4-r7}
 	pop {r0}
@@ -1905,7 +1905,7 @@ _08076B28:
 	bl sub_80522F4
 _08076B34:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076B3A:
 	pop {r3}
 	mov r8, r3
@@ -2074,7 +2074,7 @@ _08076C7C:
 	bl sub_80522F4
 _08076C98:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076C9E:
 	pop {r3}
 	mov r8, r3
@@ -2124,7 +2124,7 @@ _08076CF2:
 	str r6, [r2]
 _08076CF4:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076CFA:
 	adds r5, 0x1
 	cmp r5, 0x13
@@ -2260,7 +2260,7 @@ _08076E02:
 	ble _08076DC2
 _08076E08:
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076E0E:
 	pop {r4-r7}
 	pop {r0}
@@ -2422,7 +2422,7 @@ _08076F5C:
 	bl sub_80522F4
 _08076F68:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08076F6E:
 	pop {r3,r4}
 	mov r8, r3
@@ -2545,7 +2545,7 @@ _08077060:
 	bl sub_80522F4
 _0807706C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077072:
 	pop {r3,r4}
 	mov r8, r3
@@ -2648,7 +2648,7 @@ _08077140:
 	bl sub_80522F4
 _0807714C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077152:
 	pop {r3}
 	mov r8, r3
@@ -2750,7 +2750,7 @@ _0807721C:
 	bl sub_80522F4
 _08077228:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807722E:
 	pop {r3}
 	mov r8, r3
@@ -2825,7 +2825,7 @@ _0807729E:
 	bl sub_8041C58
 _080772AE:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080772B4:
 	pop {r4,r5}
 	pop {r0}
@@ -3001,7 +3001,7 @@ _08077410:
 	bl sub_80522F4
 _0807741C:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077422:
 	pop {r3-r5}
 	mov r8, r3
@@ -3134,7 +3134,7 @@ _0807751C:
 	bl sub_80522F4
 _08077528:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807752E:
 	pop {r3-r5}
 	mov r8, r3
@@ -3212,7 +3212,7 @@ _080775C0:
 	bl sub_80522F4
 _080775CC:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080775D2:
 	pop {r4-r7}
 	pop {r0}
@@ -3318,7 +3318,7 @@ _080776A4:
 	bl sub_80522F4
 _080776B0:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080776B6:
 	pop {r4-r7}
 	pop {r0}
@@ -3408,7 +3408,7 @@ _08077764:
 	bl sub_80522F4
 _08077770:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077776:
 	pop {r4-r6}
 	pop {r0}
@@ -3588,7 +3588,7 @@ _080778E4:
 	ble _08077874
 _080778EA:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080778F0:
 	pop {r3-r5}
 	mov r8, r3
@@ -3703,7 +3703,7 @@ _080779B0:
 	strb r2, [r0]
 _080779D8:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080779DE:
 	pop {r3,r4}
 	mov r8, r3
@@ -3822,7 +3822,7 @@ _08077AB4:
 	bl sub_80522F4
 _08077ACA:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077AD0:
 	add sp, 0x4
 	pop {r3-r5}
@@ -3927,7 +3927,7 @@ _08077B98:
 	bl sub_80522F4
 _08077BA4:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077BAA:
 	pop {r4-r7}
 	pop {r0}
@@ -3995,7 +3995,7 @@ _08077C28:
 	bl sub_80522F4
 _08077C34:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077C3A:
 	pop {r4-r6}
 	pop {r0}
@@ -4101,7 +4101,7 @@ _08077CE8:
 	ldrsh r0, [r4, r2]
 	subs r6, r0, r6
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	ldr r0, _08077D1C
 	str r6, [r0]
 	str r7, [r0, 0x4]
@@ -4256,7 +4256,7 @@ _08077E0C:
 	bl sub_803F580
 	bl sub_8040A84
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077E3C:
 	pop {r4,r5}
 	pop {r0}
@@ -4318,7 +4318,7 @@ _08077E90:
 	bl sub_803F580
 	bl sub_8040A84
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077EC0:
 	pop {r4,r5}
 	pop {r0}
@@ -4370,7 +4370,7 @@ _08077F00:
 	bl sub_803F580
 	bl sub_8040A84
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08077F30:
 	pop {r4,r5}
 	pop {r0}
@@ -4523,7 +4523,7 @@ _08078050:
 	adds r1, r4, 0
 	bl sub_80522F4
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078068:
 	pop {r3-r5}
 	mov r8, r3
@@ -4576,7 +4576,7 @@ _0807808A:
 	movs r0, 0
 	strb r0, [r3]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080780D0:
 	adds r5, 0x1
 	cmp r5, 0x13
@@ -4692,7 +4692,7 @@ _080781AC:
 	adds r1, r5, 0
 	bl sub_80522F4
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080781C4:
 	pop {r3}
 	mov r8, r3
@@ -4751,7 +4751,7 @@ _08078230:
 	bl sub_80522F4
 _0807823C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078242:
 	pop {r4-r7}
 	pop {r0}
@@ -4813,7 +4813,7 @@ _080782B0:
 	bl sub_80522F4
 _080782BC:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080782C2:
 	pop {r4-r7}
 	pop {r0}
@@ -4872,7 +4872,7 @@ _0807832C:
 	bl sub_80522F4
 _08078338:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807833E:
 	pop {r4-r6}
 	pop {r0}
@@ -4931,7 +4931,7 @@ _080783A8:
 	bl sub_80522F4
 _080783B4:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080783BA:
 	pop {r4-r6}
 	pop {r0}
@@ -5141,7 +5141,7 @@ _0807855E:
 	cmp r6, 0x13
 	ble _08078502
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807856A:
 	add sp, 0x24
 	pop {r3-r5}
@@ -5259,7 +5259,7 @@ _08078640:
 	bl sub_80779F0
 _08078668:
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807866E:
 	pop {r4-r7}
 	pop {r0}
@@ -5356,7 +5356,7 @@ _08078700:
 	adds r1, r6, 0
 	bl sub_80522F4
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078732:
 	pop {r3}
 	mov r8, r3
@@ -5430,7 +5430,7 @@ _080787C8:
 	bl sub_80522F4
 _080787D4:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080787DA:
 	pop {r4-r6}
 	pop {r0}
@@ -5487,7 +5487,7 @@ _08078840:
 	bl sub_80522F4
 _0807884C:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078852:
 	pop {r4-r6}
 	pop {r0}
@@ -5554,7 +5554,7 @@ _080788CC:
 	bl sub_80522F4
 _080788D8:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080788DE:
 	pop {r4-r7}
 	pop {r0}
@@ -5615,7 +5615,7 @@ _0807894C:
 	bl sub_80522F4
 _08078958:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807895E:
 	pop {r4-r6}
 	pop {r0}
@@ -5731,7 +5731,7 @@ _08078A38:
 	bl sub_80522F4
 _08078A44:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078A4A:
 	pop {r3}
 	mov r8, r3
@@ -5849,7 +5849,7 @@ _08078B38:
 	bl sub_80522F4
 _08078B44:
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078B4A:
 	add sp, 0x14
 	pop {r3}
@@ -6106,7 +6106,7 @@ _08078D60:
 	bl sub_80522F4
 _08078D72:
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078D78:
 	add sp, 0x28
 	pop {r3-r5}
@@ -6177,7 +6177,7 @@ _08078DFC:
 	bl sub_80522F4
 _08078E08:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078E0E:
 	pop {r4-r6}
 	pop {r0}
@@ -6313,7 +6313,7 @@ _08078ED4:
 	adds r1, r5, 0
 	bl sub_80522F4
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078F2E:
 	movs r3, 0x80
 	lsls r3, 2
@@ -6389,7 +6389,7 @@ _08078FC0:
 	bl sub_80522F4
 _08078FCC:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08078FD2:
 	pop {r4-r7}
 	pop {r0}
@@ -6499,7 +6499,7 @@ _080790A0:
 	bl sub_80522F4
 _080790B0:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080790B6:
 	pop {r3-r5}
 	mov r8, r3
@@ -6544,7 +6544,7 @@ sub_80790C8:
 	movs r1, 0x1
 	strb r1, [r0]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	ldr r0, _08079124
 	ldr r2, [r0]
 	adds r0, r5, 0
@@ -6630,7 +6630,7 @@ _080791BC:
 	bl sub_80522F4
 _080791C8:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080791CE:
 	pop {r4-r6}
 	pop {r0}
@@ -6700,7 +6700,7 @@ _08079254:
 	bl sub_80522F4
 _08079260:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079266:
 	pop {r4-r7}
 	pop {r0}
@@ -6763,7 +6763,7 @@ _080792DC:
 	bl sub_80522F4
 _080792E8:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080792EE:
 	pop {r4-r6}
 	pop {r0}
@@ -6852,7 +6852,7 @@ _08079388:
 	bl sub_80522F4
 _08079394:
 	adds r0, r6, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807939A:
 	add sp, 0x8
 	pop {r3-r5}
@@ -6914,7 +6914,7 @@ _08079404:
 	bl sub_80522F4
 _08079410:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079416:
 	pop {r4-r6}
 	pop {r0}
@@ -6971,7 +6971,7 @@ _08079474:
 	bl sub_80522F4
 _08079480:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079486:
 	pop {r4-r6}
 	pop {r0}
@@ -7028,7 +7028,7 @@ _080794E4:
 	bl sub_80522F4
 _080794F0:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080794F6:
 	pop {r4-r6}
 	pop {r0}
@@ -7085,7 +7085,7 @@ _08079554:
 	bl sub_80522F4
 _08079560:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079566:
 	pop {r4-r6}
 	pop {r0}
@@ -7128,7 +7128,7 @@ _080795A8:
 	bl sub_80522F4
 _080795B4:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -7170,7 +7170,7 @@ _080795FC:
 	bl sub_80522F4
 _08079608:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -7304,7 +7304,7 @@ _080796FA:
 	ldr r2, [sp, 0x1C]
 	bl sub_80522F4
 	adds r0, r7, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	movs r4, 0
 	ldr r6, _08079720
 	b _0807972C
@@ -7375,7 +7375,7 @@ sub_8079764:
 	strb r1, [r0]
 _08079794:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807979A:
 	pop {r4}
 	pop {r0}
@@ -7441,7 +7441,7 @@ _0807980A:
 	adds r1, r4, 0
 	bl sub_80522F4
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079822:
 	pop {r3}
 	mov r8, r3
@@ -7503,7 +7503,7 @@ _08079894:
 	bl sub_80522F4
 _080798A0:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _080798A6:
 	pop {r4-r6}
 	pop {r0}
@@ -7562,7 +7562,7 @@ _08079910:
 	bl sub_80522F4
 _0807991C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079922:
 	pop {r4-r6}
 	pop {r0}
@@ -7621,7 +7621,7 @@ _0807998C:
 	bl sub_80522F4
 _08079998:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807999E:
 	pop {r4-r6}
 	pop {r0}
@@ -7680,7 +7680,7 @@ _08079A08:
 	bl sub_80522F4
 _08079A14:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079A1A:
 	pop {r4-r6}
 	pop {r0}
@@ -7739,7 +7739,7 @@ _08079A84:
 	bl sub_80522F4
 _08079A90:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079A96:
 	pop {r4-r6}
 	pop {r0}
@@ -7798,7 +7798,7 @@ _08079B00:
 	bl sub_80522F4
 _08079B0C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079B12:
 	pop {r4-r6}
 	pop {r0}
@@ -7861,7 +7861,7 @@ _08079B7C:
 	bl sub_80522F4
 _08079B92:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079B98:
 	pop {r4-r6}
 	pop {r0}
@@ -7921,7 +7921,7 @@ _08079C08:
 	bl sub_80522F4
 _08079C14:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079C1A:
 	pop {r4-r6}
 	pop {r0}
@@ -7980,7 +7980,7 @@ _08079C84:
 	bl sub_80522F4
 _08079C90:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079C96:
 	pop {r4-r6}
 	pop {r0}
@@ -8039,7 +8039,7 @@ _08079D00:
 	bl sub_80522F4
 _08079D0C:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079D12:
 	pop {r4-r6}
 	pop {r0}
@@ -8113,7 +8113,7 @@ _08079D9C:
 	bl sub_80522F4
 _08079DA8:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079DAE:
 	pop {r4-r6}
 	pop {r0}
@@ -8172,7 +8172,7 @@ _08079E18:
 	bl sub_80522F4
 _08079E24:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079E2A:
 	pop {r4-r6}
 	pop {r0}
@@ -8293,7 +8293,7 @@ _08079EFC:
 	bl sub_80522F4
 _08079F08:
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _08079F0E:
 	pop {r3,r4}
 	mov r8, r3
@@ -8496,7 +8496,7 @@ _0807A0A0:
 	bl sub_80522F4
 _0807A0B2:
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A0B8:
 	add sp, 0x4
 	pop {r3-r5}
@@ -8551,7 +8551,7 @@ _0807A110:
 	cmp r3, 0
 	bge _0807A0FE
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A11E:
 	pop {r4-r7}
 	pop {r0}
@@ -8711,7 +8711,7 @@ _0807A260:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	mov r2, r9
 	cmp r2, 0
 	beq _0807A27C
@@ -8793,7 +8793,7 @@ _0807A30C:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A31A:
 	pop {r4-r6}
 	pop {r0}
@@ -8892,7 +8892,7 @@ _0807A3DC:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	cmp r7, 0
 	beq _0807A3F4
 	adds r0, r4, 0
@@ -8991,7 +8991,7 @@ _0807A4A8:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	adds r0, r5, 0
 	bl GetMovementSpeed
 _0807A4BC:
@@ -9124,7 +9124,7 @@ _0807A5B6:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A5C4:
 	pop {r4,r5}
 	pop {r0}
@@ -9235,7 +9235,7 @@ _0807A6A4:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A6B2:
 	pop {r4-r7}
 	pop {r0}
@@ -9295,7 +9295,7 @@ _0807A716:
 	movs r0, 0xFF
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A72A:
 	pop {r4,r5}
 	pop {r0}
@@ -9369,7 +9369,7 @@ _0807A7AE:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A7BC:
 	pop {r4,r5}
 	pop {r0}
@@ -9455,7 +9455,7 @@ _0807A866:
 	movs r0, 0
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	cmp r6, 0
 	beq _0807A87E
 	movs r0, 0x1
@@ -9527,7 +9527,7 @@ _0807A8F6:
 	movs r1, 0
 	strb r1, [r0]
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	ldrb r0, [r5, 0x7]
 	cmp r0, 0
 	beq _0807A918
@@ -9569,7 +9569,7 @@ _0807A952:
 	movs r0, 0
 	strb r0, [r4]
 	adds r0, r5, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807A95C:
 	pop {r4,r5}
 	pop {r0}
@@ -9632,7 +9632,7 @@ sub_807A9B0:
 	movs r2, 0x1
 	bl sub_806A898
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -9671,7 +9671,7 @@ sub_807A9D8:
 	adds r1, r4, 0
 	bl sub_80522F4
 	adds r0, r4, 0
-	bl sub_80418D4
+	bl DungeonEntityUpdateStatusSprites
 _0807AA20:
 	pop {r4,r5}
 	pop {r0}
@@ -25838,7 +25838,7 @@ _08082B46:
 	ldrsh r1, [r4, r2]
 	mov r2, sp
 	movs r3, 0x3
-	bl sub_800F8D0
+	bl AddPokemonDungeonSprite
 	movs r1, 0x4
 	ldrsh r0, [r5, r1]
 	movs r2, 0x6
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index ff0c5dc5..74eb4a96 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -5599,15 +5599,78 @@ gUnknown_80CE788: @ 80CE788
 
 	.global gStatusGraphics
 gStatusGraphics: @ 80CE79C
-	.incbin "baserom.gba", 0xCE79C, 0x198
+    @      width, height, vram index, unk, graphic count, offset into graphic
+    .4byte 0, 0, 0,  0,  0,  0
+    .4byte 1, 1, 0,  0,  14, TILE_SIZE_2BPP * 0    @ sleepless
+    .4byte 2, 2, 1,  0,  7,  TILE_SIZE_2BPP * 14   @ burned
+    .4byte 2, 2, 5,  0,  16, TILE_SIZE_2BPP * 42   @ poisoned
+    .4byte 4, 4, 9,  0,  6,  TILE_SIZE_2BPP * 106  @ frozen
+    .4byte 4, 2, 25, 0,  4,  TILE_SIZE_2BPP * 202  @ confused
+    .4byte 2, 2, 33, 0,  9,  TILE_SIZE_2BPP * 234  @ whiffer
+    .4byte 2, 2, 37, 0,  8,  TILE_SIZE_2BPP * 270  @ taunted
+    .4byte 1, 2, 41, 0,  8,  TILE_SIZE_2BPP * 302  @ lowhp
+    .4byte 2, 2, 43, 0,  13, TILE_SIZE_2BPP * 318  @ shield
+    .4byte 2, 2, 47, 10, 10, TILE_SIZE_2BPP * 370  @ statdown
+    .4byte 2, 2, 51, 0,  13, TILE_SIZE_2BPP * 410  @ sword
+    .4byte 1, 1, 55, 0,  14, TILE_SIZE_2BPP * 462  @ blinker
+    .4byte 2, 2, 56, 0,  10, TILE_SIZE_2BPP * 476  @ cross-eyed
+    .4byte 1, 1, 60, 0,  14, TILE_SIZE_2BPP * 516  @ eyedrops
+    .4byte 2, 2, 61, 0,  8,  TILE_SIZE_2BPP * 530  @ muzzled
+    .4byte 2, 2, 65, 4,  10, TILE_SIZE_2BPP * 562  @ sleep
 
 	.global gStatusGraphics4bpp
 gStatusGraphics4bpp: @ 80CE934
-	.incbin "baserom.gba", 0xCE934, 0x4B40
+    .incbin "graphics/status/sleepless.4bpp"
+    .incbin "graphics/status/burned.4bpp"
+    .incbin "graphics/status/poisoned.4bpp"
+    .incbin "graphics/status/frozen.4bpp"
+    .incbin "graphics/status/confused.4bpp"
+    .incbin "graphics/status/whiffer.4bpp"
+    .incbin "graphics/status/taunted.4bpp"
+    .incbin "graphics/status/lowhp.4bpp"
+    .incbin "graphics/status/shield.4bpp"
+    .incbin "graphics/status/statdown.4bpp"
+    .incbin "graphics/status/sword.4bpp"
+    .incbin "graphics/status/blinker.4bpp"
+    .incbin "graphics/status/cross_eyed.4bpp"
+    .incbin "graphics/status/eyedrops.4bpp"
+    .incbin "graphics/status/muzzled.4bpp"
+    .incbin "graphics/status/sleep.4bpp"
 
-	.global gUnknown_80D3474
-gUnknown_80D3474: @ 80D3474
-	.incbin "baserom.gba", 0xD3474, 0xF0
+	.global gStatusSprites
+gStatusSprites: @ 80D3474
+    @ Status to status image conversion
+    @      image, palette
+    .4byte 0,  0
+    .4byte 1,  0   @ STATUS_SPRITE_SLEEPLESS
+    .4byte 2,  0   @ STATUS_SPRITE_BURNED
+    .4byte 3,  11  @ STATUS_SPRITE_POISONED
+    .4byte 3,  7   @ STATUS_SPRITE_BADLY_POISONED
+    .4byte 5,  0   @ STATUS_SPRITE_CONFUSED
+    .4byte 6,  0   @ STATUS_SPRITE_COWERING
+    .4byte 7,  0   @ STATUS_SPRITE_TAUNTED
+    .4byte 8,  0   @ STATUS_SPRITE_ENCORE
+    .4byte 9,  0   @ STATUS_SPRITE_SHIELD_BLUE
+    .4byte 9,  4   @ STATUS_SPRITE_SHIELD_RED
+    .4byte 9,  3   @ STATUS_SPRITE_SHIELD_YELLOW
+    .4byte 9,  10  @ STATUS_SPRITE_SHIELD_GREEN
+    .4byte 9,  5   @ STATUS_SPRITE_ENDURE
+    .4byte 8,  0   @ STATUS_SPRITE_LOWHP
+    .4byte 3,  6   @ STATUS_SPRITE_CURSED
+    .4byte 8,  3   @ STATUS_SPRITE_SNATCH
+    .4byte 11, 0   @ STATUS_SPRITE_SURE_SHOT
+    .4byte 6,  10  @ STATUS_SPRITE_WHIFFER
+    .4byte 11, 5   @ STATUS_SPRITE_SET_DAMAGE
+    .4byte 11, 4   @ STATUS_SPRITE_FOCUS_ENERGY
+    .4byte 12, 0   @ STATUS_SPRITE_BLINKER
+    .4byte 13, 0   @ STATUS_SPRITE_CROSS_EYED
+    .4byte 14, 0   @ STATUS_SPRITE_EYEDROPS
+    .4byte 15, 0   @ STATUS_SPRITE_MUZZLED
+    .4byte 9,  7   @ STATUS_SPRITE_GRUDGE
+    .4byte 14, 4   @ STATUS_SPRITE_EXPOSED
+    .4byte 16, 4   @ STATUS_SPRITE_SLEEP
+    .4byte 10, 3   @ STATUS_SPRITE_STAT_DOWN
+    .4byte 4,  0   @ STATUS_SPRITE_FROZEN
 
         .global gUnknown_80D3564
 gUnknown_80D3564: @ 80D3564
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 7ad38cb8..036c63a8 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -1,3 +1,4 @@
+#include "constants/status.h"
         .section .rodata
 
 	.global gUnknown_80F42D0
@@ -1628,72 +1629,124 @@ gUnknown_80F6604: @ 80F6604
 gUnknown_80F6624: @ 80F6624
 	.incbin "baserom.gba", 0xF6624, 0x78
 
-	.global gUnknown_80F669C
-gUnknown_80F669C: @ 80F669C
-	.incbin "baserom.gba", 0xF669C, 0x18
+	.global gStatusSpriteMasks_SleepStatus
+gStatusSpriteMasks_SleepStatus: @ 80F669C
+    .4byte 0                       @ SLEEP_STATUS_NONE
+    .4byte STATUS_SPRITE_SLEEP     @ SLEEP_STATUS_SLEEP
+    .4byte STATUS_SPRITE_SLEEPLESS @ SLEEP_STATUS_SLEEPLESS
+    .4byte STATUS_SPRITE_SLEEP     @ SLEEP_STATUS_NIGHTMARE
+    .4byte 0                       @ SLEEP_STATUS_YAWNING
+    .4byte STATUS_SPRITE_SLEEP     @ SLEEP_STATUS_NAPPING
 
-	.global gUnknown_80F66B4
-gUnknown_80F66B4: @ 80F66B4
-	.incbin "baserom.gba", 0xF66B4, 0x14
+	.global gStatusSpriteMasks_NonVolatileStatus
+gStatusSpriteMasks_NonVolatileStatus: @ 80F66B4
+    .4byte 0                            @ NON_VOLATILE_STATUS_NONE
+    .4byte STATUS_SPRITE_BURNED         @ NON_VOLATILE_STATUS_BURNED
+    .4byte STATUS_SPRITE_POISONED       @ NON_VOLATILE_STATUS_POISONED
+    .4byte STATUS_SPRITE_BADLY_POISONED @ NON_VOLATILE_STATUS_BADLY_POISONED
+    .4byte 0                            @ NON_VOLATILE_STATUS_PARALYZED
 
-	.global gUnknown_80F66C8
-gUnknown_80F66C8: @ 80F66C8
-	.incbin "baserom.gba", 0xF66C8, 0x20
+	.global gStatusSpriteMasks_ImmobilizeStatus
+gStatusSpriteMasks_ImmobilizeStatus: @ 80F66C8
+    .4byte 0                    @ IMMOBILIZE_STATUS_NONE
+    .4byte STATUS_SPRITE_FROZEN @ IMMOBILIZE_STATUS_FROZEN
+    .4byte 0                    @ IMMOBILIZE_STATUS_IMMOBILIZED
+    .4byte 0                    @ IMMOBILIZE_STATUS_WRAPPED_AROUND_FOE
+    .4byte 0                    @ IMMOBILIZE_STATUS_WRAPPED_BY_FOE
+    .4byte 0                    @ IMMOBILIZE_STATUS_INGRAIN
+    .4byte 0                    @ IMMOBILIZE_STATUS_PETRIFIED
+    .4byte 0                    @ IMMOBILIZE_STATUS_SQUEEZED
 
-	.global gUnknown_80F66E8
-gUnknown_80F66E8: @ 80F66E8
-	.incbin "baserom.gba", 0xF66E8, 0x20
+	.global gStatusSpriteMasks_VolatileStatus
+gStatusSpriteMasks_VolatileStatus: @ 80F66E8
+    .4byte 0                      @ VOLATILE_STATUS_NONE
+    .4byte 0                      @ VOLATILE_STATUS_CRINGING
+    .4byte STATUS_SPRITE_CONFUSED @ VOLATILE_STATUS_CONFUSED
+    .4byte 0                      @ VOLATILE_STATUS_PAUSED
+    .4byte STATUS_SPRITE_COWERING @ VOLATILE_STATUS_COWERING
+    .4byte STATUS_SPRITE_TAUNTED  @ VOLATILE_STATUS_TAUNTED
+    .4byte STATUS_SPRITE_ENCORE   @ VOLATILE_STATUS_ENCORE
+    .4byte 0                      @ VOLATILE_STATUS_INFATUATED
 
-	.global gUnknown_80F6708
-gUnknown_80F6708: @ 80F6708
-	.incbin "baserom.gba", 0xF6708, 0x34
+	.global gStatusSpriteMasks_ChargingStatus
+gStatusSpriteMasks_ChargingStatus: @ 80F6708
+    .4byte 0 @ CHARGING_STATUS_NONE
+    .4byte 0 @ CHARGING_STATUS_BIDE
+    .4byte 0 @ CHARGING_STATUS_SOLARBEAM
+    .4byte 0 @ CHARGING_STATUS_SKY_ATTACK
+    .4byte 0 @ CHARGING_STATUS_RAZOR_WIND
+    .4byte 0 @ CHARGING_STATUS_FOCUS_PUNCH
+    .4byte 0 @ CHARGING_STATUS_SKULL_BASH
+    .4byte 0 @ CHARGING_STATUS_FLY
+    .4byte 0 @ CHARGING_STATUS_BOUNCE
+    .4byte 0 @ CHARGING_STATUS_DIVE
+    .4byte 0 @ CHARGING_STATUS_DIG
+    .4byte 0 @ CHARGING_STATUS_CHARGE
+    .4byte 0 @ CHARGING_STATUS_RAGE
 
-	.global gUnknown_80F673C
-gUnknown_80F673C: @ 80F673C
-	.incbin "baserom.gba", 0xF673C, 0x3C
+	.global gStatusSpriteMasks_ProtectionStatus
+gStatusSpriteMasks_ProtectionStatus: @ 80F673C
+    .4byte 0                           @ PROTECTION_STATUS_NONE
+    .4byte STATUS_SPRITE_SHIELD_BLUE   @ PROTECTION_STATUS_REFLECT
+    .4byte STATUS_SPRITE_SHIELD_RED    @ PROTECTION_STATUS_SAFEGUARD
+    .4byte STATUS_SPRITE_SHIELD_YELLOW @ PROTECTION_STATUS_LIGHT_SCREEN
+    .4byte STATUS_SPRITE_SHIELD_BLUE   @ PROTECTION_STATUS_COUNTER
+    .4byte STATUS_SPRITE_SHIELD_YELLOW @ PROTECTION_STATUS_MAGIC_COAT
+    .4byte 0                           @ PROTECTION_STATUS_WISH
+    .4byte STATUS_SPRITE_SHIELD_GREEN  @ PROTECTION_STATUS_PROTECT
+    .4byte STATUS_SPRITE_SHIELD_RED    @ PROTECTION_STATUS_MIRROR_COAT
+    .4byte STATUS_SPRITE_ENDURE        @ PROTECTION_STATUS_ENDURE
+    .4byte STATUS_SPRITE_SHIELD_BLUE   @ PROTECTION_STATUS_MINI_COUNTER
+    .4byte STATUS_SPRITE_SHIELD_GREEN  @ PROTECTION_STATUS_MIRROR_MOVE
+    .4byte 0                           @ PROTECTION_STATUS_CONVERSION_2
+    .4byte STATUS_SPRITE_SHIELD_GREEN  @ PROTECTION_STATUS_VITAL_THROW
+    .4byte STATUS_SPRITE_SHIELD_BLUE   @ PROTECTION_STATUS_MIST
 
-	.global gUnknown_80F6778
-gUnknown_80F6778: @ 80F6778
-	.incbin "baserom.gba", 0xF6778, 0x10
+	.global gStatusSpriteMasks_WaitingStatus
+gStatusSpriteMasks_WaitingStatus: @ 80F6778
+    .4byte 0                    @ WAITING_STATUS_NONE
+    .4byte STATUS_SPRITE_CURSED @ WAITING_STATUS_CURSED
+    .4byte 0                    @ WAITING_STATUS_DECOY
+    .4byte STATUS_SPRITE_SNATCH @ WAITING_STATUS_SNATCH
 
-	.global gUnknown_80F6788
-gUnknown_80F6788: @ 80F6788
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
+	.global gStatusSpriteMasks_LinkedStatus
+gStatusSpriteMasks_LinkedStatus: @ 80F6788
+    .4byte 0 @ LINKED_STATUS_NONE
+    .4byte 0 @ LINKED_STATUS_LEECH_SEED
+    .4byte 0 @ LINKED_STATUS_DESTINY_BOND
 
-	.global gUnknown_80F6794
-gUnknown_80F6794: @ 80F6794
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x01, 0x00
-        .byte 0x00, 0x00, 0x02, 0x00
-        .byte 0x00, 0x00, 0x04, 0x00
-        .byte 0x00, 0x00, 0x08, 0x00
+	.global gStatusSpriteMasks_MoveStatus
+gStatusSpriteMasks_MoveStatus: @ 80F6794
+    .4byte 0                          @ MOVE_STATUS_NONE
+    .4byte STATUS_SPRITE_SURE_SHOT    @ MOVE_STATUS_SURE_SHOT
+    .4byte STATUS_SPRITE_WHIFFER      @ MOVE_STATUS_WHIFFER
+    .4byte STATUS_SPRITE_SET_DAMAGE   @ MOVE_STATUS_SET_DAMAGE
+    .4byte STATUS_SPRITE_FOCUS_ENERGY @ MOVE_STATUS_FOCUS_ENERGY
 
-	.global gUnknown_80F67A8
-gUnknown_80F67A8: @ 80F67A8
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
+	.global gStatusSpriteMasks_ItemStatus
+gStatusSpriteMasks_ItemStatus: @ 80F67A8
+    .4byte 0 @ ITEM_STATUS_NONE
+    .4byte 0 @ ITEM_STATUS_LONG_TOSS
+    .4byte 0 @ ITEM_STATUS_PIERCE
 
-	.global gUnknown_80F67B4
-gUnknown_80F67B4: @ 80F67B4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
+	.global gStatusSpriteMasks_TransformStatus
+gStatusSpriteMasks_TransformStatus: @ 80F67B4
+    .4byte 0 @ TRANSFORM_STATUS_NONE
+    .4byte 0 @ TRANSFORM_STATUS_INVISIBLE
+    .4byte 0 @ TRANSFORM_STATUS_TRANSFORMED
+    .4byte 0 @ TRANSFORM_STATUS_MOBILE
 
-	.global gUnknown_80F67C4
-gUnknown_80F67C4: @ 80F67C4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x10, 0x00
-        .byte 0x00, 0x00, 0x20, 0x00
-        .byte 0x00, 0x00, 0x40, 0x00
+	.global gStatusSpriteMasks_EyesightStatus
+gStatusSpriteMasks_EyesightStatus: @ 80F67C4
+    .4byte 0                        @ EYESIGHT_STATUS_NONE
+    .4byte STATUS_SPRITE_BLINKER    @ EYESIGHT_STATUS_BLINKER
+    .4byte STATUS_SPRITE_CROSS_EYED @ EYESIGHT_STATUS_CROSS_EYED
+    .4byte STATUS_SPRITE_EYEDROPS   @ EYESIGHT_STATUS_EYEDROPS
 
-	.global gUnknown_80F67D4
-gUnknown_80F67D4: @ 80F67D4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x80, 0x00
+	.global gStatusSpriteMasks_MuzzledStatus
+gStatusSpriteMasks_MuzzledStatus: @ 80F67D4
+    .4byte 0                     @ MUZZLED_STATUS_NONE
+    .4byte STATUS_SPRITE_MUZZLED @ MUZZLED_STATUS_MUZZLED
 
 	.global gUnknown_80F67DC
 gUnknown_80F67DC: @ 80F67DC
diff --git a/graphics/status/blinker.png b/graphics/status/blinker.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf6415f9e33d68bd90f7585a1859f5fd5158360
GIT binary patch
literal 217
zcmV;~04D#5P)<h;3K|Lk000e1NJLTq000O8003|V00000!{vke0001>Nkl<ZD3O)Y
zJr2S!3<cn~pxy+wuranrfD<qjDc!0rC|eKP2)eyUlsU#C10aeTy!w;nKZpi|6vS=}
zxSq!rm!dl&9#$bG5_vh>s3Tjj=(yx;(}NmW&N_AEk{hk-5uN*TcXE%oJE<Ftx_YCo
z^dTjlq!O9n$r5p0e>gJ)Ok{;p#3wh9X4c)v?VHP}m)qZ8^Uk{EJ?Gr_#~(ZZ&5~Ma
TE5Gv_00000NkvXXu0mjf!O>bQ

literal 0
HcmV?d00001

diff --git a/graphics/status/burned.png b/graphics/status/burned.png
new file mode 100644
index 0000000000000000000000000000000000000000..523fa83ba854840adb41215c6b317f54477a1b19
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG003|V00000_nboJ0005jNkl<ZD3N88
zJ(A=g427xQ#OHtx$a)J1$k?(v=!`2-cmvKmC};J9XM%O$`bx-p4@owQpIMd>Sa8Go
zhGJHflxpa;@I^;O4m77ogdm|)h_h?KaBlEkA^D+@+o8#`J$9Wxe}6=$0Nys<93nuF
z2rf(lWx;dj1eX-NV`8vfC4ArNx!WNSh955mXzdVqH`6Nv`s1mhpNAI2suBogL)eki
z-EfITvqHyM1s-7KUbERD1u@&Ee!%))DlxtKso<@sCulv1!_Y2?d~QG3x>Qy>EKwBZ
zMfUmViyC-x@}z-a=bTa(46aiPU7EG9P(P|dxTJELS+o$Q7j-xTkH@S}$YwB{!y7&F
zZ8%8|t-ty6xVJ?_$%hHNMl=I~&>gJ}Uv>1V!~Ojq<fqOZL!?Nm1g;nuiR1|Ib7AyU
zhYW)kKhuUWq*2ihZ4@2y+*u1F$cmO|Q_@|{4peJ)r&{O}^=H+&a+2*0DHQHANs-pq
zMZ@7+_*WR6hHCQ6+ylB7w8M&4Y(~5B(-!a#T|dm%_dcI--xO`yHk{k5UhMs&IWf;x
z49#|~y4XBzTU`8k90hoSG9(clJ?XNID;7SYnb;_ib_`jzNpsWxix!GX{{v(wSYTbt
RGlBpB002ovPDHLkV1mcS@HGGc

literal 0
HcmV?d00001

diff --git a/graphics/status/confused.png b/graphics/status/confused.png
new file mode 100644
index 0000000000000000000000000000000000000000..709a25116d8116e2080afb4315bd79fd37eff5b1
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq001BW002M)00000n-#}%0004=Nkl<ZIE`JC
zp<=`!42F^1#O}E^vsbE2Dy}CcLQTwx-VCpGa}yH;!+=0<w5H`NP5%EUHA%0)?ZLGB
z<-`MsFo7F(yc=9Pn9Jr5Am4#LVeB=?qSgzGU;-of_(pw61eOg(Tm#pFGFew@Y(B+v
z-LipiZDo?OC)a2o()Cepu>(Q?|6jU%wMM)2yFY+^y_*Y1@Z$#%*p7)^PB`p{0EC0m
zL|<I=+LvS`CnhPbg-({(0Fx(9*@Y|{dNh&~>$<guJic|cG`Bgix~>7FmRL#-tOl@q
zA#)qNM1<b~Bu}H;F%LX|FyRR3ajLT+RzY|}O=E*o1#<hDHAXwtvyC4?K|cLiyGZ>a
z&&SFK9bQkLo<L{J>iqR7bk~dOBAF|QM4$Dgvm0wb=Xb6$U~Y*mzol(J;O2$3#p(`u
zcz*yoB*k1?Zj1^dS4}ccP5~|Ye{FD9aIu<?04=H%RxRT0Dm{_rQ_s4#y*FjC>ySQh
zK|{_>wTM{giB(&21=DK4Yf)B)Q$y~Jvt3XC9Cy3bt@C^63Z8#UN`JqqfJ<++1=s)p
N002ovPDHLkV1nZ~&q4qI

literal 0
HcmV?d00001

diff --git a/graphics/status/cross_eyed.png b/graphics/status/cross_eyed.png
new file mode 100644
index 0000000000000000000000000000000000000000..761e2f2b8e35c9c3f0df32e7e7278179073021c2
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000mG005u_00000<)U8600041Nkl<ZIE|&0
zy>f&w420E~GWTjUa*1hZ;g!>HCD7O<ime|CAD4J?6wD6Bs}E@n5YgoG4Tz${z+#-A
zo(1eDiXalPQIw^8n?<B<7jb-%iie7Gub&)Cy~Nk8NKRkw0a>JOo0cMSrEf;fzQr1f
z-MARoZea8$ShOdx9W22jq6fz!bB(+`W-d02L2G3<2(tYEb!M(2&fc6S6Pt+`n!#Rq
zyzvY-JiR(cG#+m}*ue9Cf~nUfL?>Xv0hBpb9#eLSLFYBuywK+5t=3?*LS3sRNLQXw
z^E_Fe(emtW@{E>eZ+RZ-qMzlN66z--O7+Nr22SW2SUgIDfV4rpeat|--EDQA|J9!x
zF=-R{7f=NM0*Y{@Wh{uiMq(UfS4p%G&ehQ)XU<y<)^yM=9=Lc`sgA~zJJ?k`(Y@t?
sny2O9zsxJyyh@-MOalGEyu$AoKO8?^raP2|B>(^b07*qoM6N<$g0G;m4*&oF

literal 0
HcmV?d00001

diff --git a/graphics/status/eyedrops.png b/graphics/status/eyedrops.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e4f11d6ec31238416f65b1f95ad4bc1d9f4300
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000O8003|V00000!{vke0002gNkl<ZD3O)Y
zy$-@46b0b37>iHm=;R|97ZcsO7>fgCyi;Ygi*Ka`hO*X0yh=<OHU6-X^M!B^Ao4<N
z+lb4&2{<j98IHsG6qoTJq#%(ex7@JH@=tELVJ9uS?VjCa{pze@m)ihadj&f(inm!v
zLC=wlI2*s~xlW4`u_*eaQ?>*dFR>-JhZLGXTF4Y6vOAY3+qOexyo0Cu04uaYm1iym
zchZ|f*8#4e3O36h_j@-l$(t*_x?j&Tp8F%m{R#c4=ew&tyOH_&ZmZ@G_xca6@ET!n
T4oNnw00000NkvXXu0mjfFHLou

literal 0
HcmV?d00001

diff --git a/graphics/status/frozen.png b/graphics/status/frozen.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecb9871bb8197b2c33f1f407c5f3267e62bb6d8e
GIT binary patch
literal 1126
zcmV-s1eyDZP)<h;3K|Lk000e1NJLTq001BW006)Q00000g{9N0000CnNkl<ZNQu4H
zJ(rz03<h8|=Kei560IA{<)i_Z{N-tKDcM)TaBY&ayTxWRIXQ!3{G|t5bUgmh{af9}
zK%#l;1DU9lF7S>NRKD&2o)KXEx&oPrSedm2RG2M5c*z294w9J#{aE0gg(;v($Y+bp
zA>rAEsag<-v7$TlI<IBbgMP+WS*?MTy05y?Pm+0In?|k2p1<fVTrh7E#p?Dfv{zlx
zz*=Aii_lTgz+R~qcq6bcc*d;HfTD#e#?Y*`9g4szS)(Y+kt4kd?U_Y0)-t~_8$rMZ
z%m{5Mh9Dd5HlwUuY?G9~XqU3>KUBBx7)r%VkF^{-mbIlI)dM>=dzE_RX|AgW)(vyn
zkBkP2P7i+ve^oS~D+G2ylg)>&#W%T@T31~~(e;@IJXUm2(V)xzfp*&v_$MEk%IG7~
zJovE0^gb-LPak3Mk-bH{eK5m-aJ+p)Bqn}*M5NApJ$*12buiL=@MJ#t<0DS+fgaq4
znvYPjz3{g_qD{11fqjV-FCVM8kHCWubss@&iXR`zePB+s+YA6kwrpTF19SO^r;h+1
z3zGU1yXqX4%LjAk1Jg{u_?VDh?R;d>*nH^eLq0zAkNJqBkHm32KWx)RA4tUD10Rb#
zd=UP*d?45CXUOftP8|4%Yyk|I4Gi06+iC-R_z83Skg}40vdss(5AJ-#;wf?;$gTU}
z+lRUjM$&p8n8L#cg{W!p!IRR2CG!07L9;E%eE5{-G+DM|*bGebfx$Jx2M%XU89pFv
z@PR#QKIZ0wUr4D1<n)n#@ewfk>7$%JSord>7W2XXy^q8XAK~ExseJfAAoe~imH3n{
zAHhH6bo(H;fiuK8ypse6f&jUX5d8>3ucr@!k7z)qwJdVbxBI{g?nBInz7}f9J$-P&
z2;BQv!YRnI?>>;jaQRU8!MBg)^Z};V`5~td97%ETk#JAF%!l1C_IfTkm=87|Y<I%x
zBf5`x`#}1W`Is*svGZZ~%hQM7FV11Pedy=|U*UMa{2xA$p3z6(NB!~ifxyED0=QtC
zkLdLW$J+;8KDhZvb_C(ut!XwNp{QLB?qh-vTr8_Ka38z@jLwURav$7$;DvU-G#}^j
z@bO{KRIb4O!;ZDfN2@=uvd#zomnIw`TcTh-uq5*lrxjygJ`j+S?EEtyt^Tm%&hHm&
zuKW1Lp*YkZ+3JtfogeNaKYirh2iA8MB>UWa!2cijK~Epy;e(z&toj^$AXA+W-*=Rw
zcl|+LpJET&{et#Z8{|_ER+-p6T=i+FRw*I{?S4T)^znfW`VL|~Xz-D(!K40YK0ftn
zh<$xZ&-xUC`uc;BYOhZdYUSnwH6g!nrUvs7n-2g2&d!H_R9AiK^#^r6mbv+G4j9kR
s51D`Cg9jh@k*@y0E={A4{4ag{1;*~X`dm!$wg3PC07*qoM6N<$f-)F0fB*mh

literal 0
HcmV?d00001

diff --git a/graphics/status/lowhp.png b/graphics/status/lowhp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b053ac93ab6d5aad49cf4db4b3c9bfaccbeef4d
GIT binary patch
literal 245
zcmV<R01E$!P)<h;3K|Lk000e1NJLTq000O8004jl00000)_0oY0002INkl<ZD3O(s
zu?~YE6h&F6o8QKwZlp_B;?k9GbrClB1L(a*L=#C{hm#<WllSfu8J{>I1;7tcWH%BM
zu$nB=+XAl$3_uPjP7%N*V9W7d^`NB#7LB_3Z&eO>n`R9>4WKL_4|AV)q{BB-Kb7M}
z6{zZ|(r1<LifXy4WK(s6ZD=Q`A{LtIONx_=xT6k@OF%dCqs7U+HAGPIQ#UHz%#Z&9
vioGmAazF>H?4V+M`)wc1CD$g+FH8Oaj<>du{4-k|00000NkvXXu0mjfEjnVS

literal 0
HcmV?d00001

diff --git a/graphics/status/muzzled.png b/graphics/status/muzzled.png
new file mode 100644
index 0000000000000000000000000000000000000000..29682972af4d8682523d36e61e11d184ac1fcaa3
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^0zllr0wfq7@kRd!Qae3e978O6uLgVb9a0cb{i@_!
z*gvz(U+He~|7?fvk9nq~cNnhR6%ctK``O=HB8Pt)m2Y^pQLE$3Y^IxE4!&3yabR0Z
zL}=nexr8exCL9(J?0?z*%Ogmm)+uDo!fD^^Qg*USm>NBi|90`Zh`!+z6|LG6>Cq=D
zXVrxEGJj`S?A9jJ_WtY6u3S6rfap)EhnC(_=UrTVi5)DV|8?fq8LSgd<z9dO=+euA
n`5?s|KaRiuy!rom@pspGuP5m3xSSQX2;>=0S3j3^P6<r_qB3mX

literal 0
HcmV?d00001

diff --git a/graphics/status/poisoned.png b/graphics/status/poisoned.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0de13a665db03f341c6b3f542be064627775de6
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000mG0096500000TFFF{00046Nkl<ZNQv#0
zv2uej42F40DO)zn8=Ycp@U$_T7}@Mfwz)WIu1Tk+y_n@Y3rinAcQEA4x^f=!MgTM`
z1OPyvhs`PIRs);|t5{9JZoY<6`shxP5-H?By1aEJy;y;5!)9&ls7zPlxxlkNG`H!b
z(~%rrLoM|_;o^f>d{}+he70bMWxAuPk<H?VK3s?Lz{n2y3TjDjKJ`B6XVXBS5(`gD
z^I_h7@M)jY*>^r0Fz9rJgPaZ$6#NcuFNJnWW6?vtOh;&MM}!S>n3n3Zeen@p2Fc=G
z6{7i!3TNxAkgCr*BoK#UaFp{=qQba?696k+jz{w`ND*ON`&l`Pj0KXzwfb14?1+?|
z6t#_=TCCyJ`<w(&e6Ml5)krlK^;t|~dY};<HXou#K6mo5Sn#e7>^^&j-^XJ83>K$P
x+)r=oozFX;f0oayeSco<`}}wQU%&8w{{$36RxOP64!i&W002ovPDHLkV1oA$x2ymF

literal 0
HcmV?d00001

diff --git a/graphics/status/shield.png b/graphics/status/shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..d464e9ea2102ced4c71de3141b18e5172de48a4f
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000mG007Vg00000?toJW0004>Nkl<ZIE}^C
zv5vwp3<h8?fll{qSsZSvy4Yd5t;yP@$7^<}#02Y2<<i&z6(n>jNZ09Cg77D&ap9s5
z+`@E9&pCww(eYObWAriR5cob2vd^I{A>99X+Hnl?A6`bE7UnP^pQY&Ow5<Nj0|v8a
zU@b9_mKgXSJR?Abb#4@UVOS$YhsNnjb6qK(f*;$rd5+>i=(<{(u$NjE%uZoW7#7ek
zsaJgC)Z^Sb&rk6T>iLA~BX^!G=0LVGA_T*=2tkEl)Pt-ZaN^k*FP?#4>koEaW<=g&
zff)&mMukv>u*rcFD2E=vi6`|=J!vO<09U*}h{}jQ;F1xUWTizFwg?gq2{e0-6$*7a
z*tz_CUWCO1t2|6~x$m`loO+m)fdcDMsaxi}(m^lOX-n$q=N&n(m7d%DQI8L`dgM@&
z#}!!Vk5G>llXwnnt@J0*+dMi_<nGKKz0`<h{-9e@znL;M-FIx%!^LCY?eWFq{1SHE
z3d~uUJVfG&LEj&wRh}o`3;!^m-NSqiLFXYqc-GA4m%m?J=Cl9fJp2WJ2+Lo|VDdx&
O0000<MNUMnLSTY38r<Xn

literal 0
HcmV?d00001

diff --git a/graphics/status/sleep.png b/graphics/status/sleep.png
new file mode 100644
index 0000000000000000000000000000000000000000..1424dc56d7f28ddf3cf81814019d023e258cc9d7
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000mG005u_00000<)U860003eNkl<ZIE}58
zyOP5o3`PBu*rltW(p8|;R~wbAfU9MPn29GF8s8Cm93;$=bC#%U`73lqZbD*SU}!=O
zO{gI+vvBxKL_8ppS%|xju%@aa_k=v<0Y+vE*DYy0!dE=v85XfEtDcAl=bBKf!6I`W
zM9IaG+0IqKqTjLgWMB}SpH_V(p0p0%-*brxw!sZNL%4Xi!%_xV!drP2VdOboZPl%r
z-V@>B4p_=zYg-6D0kvd<v-Kyt)$=#1pU(NC3cXmkKgk+JC~-zaZQwa6JoX||kNOD1
z={joWlBjJZn-?MTX*}D=vqt48f_nHT7}^E5w#@ziqLF8t@=y$J$*mpt{`WUL-cuYC
yzVKLoF6O0u`6f>y<Vknl!xx?s<=gx7f1V#xEPix%{j(1M0000<MNUMnLSTYvC7#Rx

literal 0
HcmV?d00001

diff --git a/graphics/status/sleepless.png b/graphics/status/sleepless.png
new file mode 100644
index 0000000000000000000000000000000000000000..22235a6ac38375208ccbd57c9921d0512f1811f1
GIT binary patch
literal 214
zcmV;{04e{8P)<h;3K|Lk000e1NJLTq000O8003|V00000!{vke0001;Nkl<ZD3Ptv
zI}QRN5C-7CF@nXO%@cS8vyD9`Ae2-aN@+OLHo8CoHvmVsFlJ+%!fEHrJkcr8OX+Ci
zQgOd5XWaJV3GKM6YhopD=Q25;$sOEJXA?PTwysqorBq~>1G4o2Q5ub=#D{y8no`B=
z@_^a;0ZEz(&B(0_*NWuQ(^+ytv0N1DOJ7Ycnxy|#k2@b@U+(?5|KR=i0kj2R2cb(c
QQ~&?~07*qoM6N<$g8o=odH?_b

literal 0
HcmV?d00001

diff --git a/graphics/status/statdown.png b/graphics/status/statdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e495ae2c6ac679d24d8cd37b9b28eb2620e0de4
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq000mG005u_00000<)U860003ANkl<ZIE}s3
zJr2S!3<Y2>5nIoe#p>3P5p_XqJ!_YeExAEL?7Wm8l|m#$7c2|<J~<AQ@X&4%y$@Q<
z%!3vS3NM9E6b;K0D4ylB50sn~Q~r*$`XIk@($E*4`|`r%CS=9%Io%+Aeod!8q%Ty{
z!SHiUH%K3Up1$X?X7~WJe}LURY&$Kk$Kwe?>L4V*$S9170F&7%jDCGyE5ltbQ(fBb
znYwThdZ8*T%Zx6P&BOxB4TX(VVWt7LdRE56#Bgx;iEZ64z&MM_h7%q1D08DsOd1*?
z4UHHN-^2DN_U68`f^g&D$qk%f_1Fea)5JDCZ0kP&JZ$Sm!6S`k&(6eJJ*^vl1CW2*
UyBk@j$p8QV07*qoM6N<$f|CS_xBvhE

literal 0
HcmV?d00001

diff --git a/graphics/status/sword.png b/graphics/status/sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..0507994e480e3ba7ce3853122723fb7df2617907
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000mG007Vg00000?toJW0003)Nkl<ZIE~fS
zKTpCy7zXfXksJ(sHWqPXlupFO)!c%i4z;6pv5QGJzLE<{mv*HcdfvT%Fd;6ON`UFf
z(_ZeEYu^GVKXg?s0b>nUwT2l5_jz|+Q|RVY!Esgl5UOtGgRiEWMF`z|FbJ1IHFgv_
z+;Fp5+&|Dg)B1~6xyp4Fdi2~H^-Lbc6B+f`UOh%VlcjhfqaM2yPh=ADSR)<_@oe!w
z9{b}-)Uy)L3&gVp4m}@7dzx%50V57Au+}hQPmxju*Tz)&<y3_&LdBjUHSgqUV|`vl
zDxUTao+tGf@mR#-0p8eSF=S5~s<1@^_4tZCz7kK4V?Ddq!}Do)b2=Zxo*a0l&~W9K
zTlMVr9@~fK+|K9R-k;y*%k1YXVNaQ_WWF+;FREz1GM)D_k7d5Hp?J#t(&zo6zK19K
azxW0#s1XH!Z>zlk0000<MNUMnLSTYQC#-=0

literal 0
HcmV?d00001

diff --git a/graphics/status/taunted.png b/graphics/status/taunted.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d0a16a45b0fba0d3179902d696d0f2a3aa8ccfd
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000mG004jl00000;tpH?0006aNkl<ZIE~Gd
zJC5Tp3_w{rDRO3&k_%%?QH8K&q(T=+kPG;80?U{(RwDTZ&XUSB!49zPrg|VK@|hvw
z_5Fj_UiPiR^ZHyWJTA|vFy#2S4I4ozdAb&k^vlxc4fgpm=J+JIUar&9Gc5CzBSAlw
zoEI)Q#JKRQJ;r(9$e!aca>0EbV{JjD%U0nppH;1)!d<SmCMSRI@a>bV;>t;fpc6H9
z(j>nUD5-4F48hst3A8CG1ulr*hw9_KLyqjpqp3d5_<#A_o4c*>1?RRVulV~Yw<_k^
zrnV5q2**u9IXn|I(6mM{7~MJ~5Xw7e>vtiVs)4Abtzsxu_0bAHeacp<&km<%d&2=v
zoU=;>2SKl>jG!2|IB1G>a0gIY98T~B00;Stpb-R`0p$TD=P1-l@~cKlNrtagN&yXn
zmH-{Af|OkqBcJl&BRci%bCg~6K?AL3AMZ8Acp67%L~CIcjdA+e!IuEp;+Zs*CUB&o
zJhmPwM;h-84~k}hNdMp~@q846Ls<v4(&+5ZKH8eMkL<9n&F+J=j(tjT6yt5_QqVR)
z(kdj^S-5M7)~}>t96=%tQ@kynaxjz>c#&vFyf3W5`(p@-_gEJx@oN3-(@*2u=W-kB
zS?zJTO!M1krWjw-Eie7FK<=+go^KO8`pYoI=M5g?OpqsdjwMbdQqHiHyzrsX4aLYl
pneS_4pBRUFXqiv%!{`6H_djOuDf~G&nn?fv002ovPDHLkV1f=~9*O_}

literal 0
HcmV?d00001

diff --git a/graphics/status/whiffer.png b/graphics/status/whiffer.png
new file mode 100644
index 0000000000000000000000000000000000000000..595a0d2fe00377cc286e537917ec80bb59633b47
GIT binary patch
literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq000mG0058#00000;n-PZ0003$Nkl<ZIE|f@
zv66!z5Qew04X<Wn%CmAydF3>*1RA%51NPq}b9Zsf=}huD`B^@|4HaC}J`#XO*FhG8
zaEl#sy%8=SfGfU38m<P6f|r0yd_P>+V3}Npyp0Ma6QG26tdYoI@PMi5RLFrn!Xchm
zmpq`3Qw^RRG)6!ngAkv?ll_<mgNYUL#t_TF+gu0R@)w9VU_f3xGWVI1>(O>KxLxS}
z)kBfwiaJ>>>hR4V$8)nE0l$E1+&wh*85;FjW{72mSYfLZ{y+OGJdR+0z}UXT)4l?v
zFI{H9Fq7^9%}0m(8IS{v0GSM~*l_vb<Dp?^nkIt*8g+3v_i)xH0Yp8hECzgw(8!v>
zi}0(CK*O<W)JDf&%CMqAF4ms$olgR&M}-9->QO;G&cBe>4i0@<y&_=MO!LxAEBOr{
WoDKL@Y~)%10000<MNUMnLSTYyu%+Mt

literal 0
HcmV?d00001

diff --git a/include/constants/status.h b/include/constants/status.h
index 229171f2..19b860be 100644
--- a/include/constants/status.h
+++ b/include/constants/status.h
@@ -8,11 +8,13 @@
 #define SLEEP_STATUS_YAWNING 4
 #define SLEEP_STATUS_NAPPING 5
 
+#define NON_VOLATILE_STATUS_NONE 0
 #define NON_VOLATILE_STATUS_BURNED 1
 #define NON_VOLATILE_STATUS_POISONED 2
 #define NON_VOLATILE_STATUS_BADLY_POISONED 3
 #define NON_VOLATILE_STATUS_PARALYZED 4
 
+#define IMMOBILIZE_STATUS_NONE 0
 #define IMMOBILIZE_STATUS_FROZEN 1
 #define IMMOBILIZE_STATUS_IMMOBILIZED 2
 #define IMMOBILIZE_STATUS_WRAPPED_AROUND_FOE 3
@@ -21,58 +23,7 @@
 #define IMMOBILIZE_STATUS_PETRIFIED 6
 #define IMMOBILIZE_STATUS_SQUEEZED 7
 
-#define CHARGING_STATUS_NONE 0x0
-#define CHARGING_STATUS_BIDE 0x1
-#define CHARGING_STATUS_SOLARBEAM 0x2
-#define CHARGING_STATUS_SKY_ATTACK 0x3
-#define CHARGING_STATUS_RAZOR_WIND 0x4
-#define CHARGING_STATUS_FOCUS_PUNCH 0x5
-#define CHARGING_STATUS_SKULL_BASH 0x6
-#define CHARGING_STATUS_FLY 0x7
-#define CHARGING_STATUS_BOUNCE 0x8
-#define CHARGING_STATUS_DIVE 0x9
-#define CHARGING_STATUS_DIG 0xA
-#define CHARGING_STATUS_CHARGE 0xB
-#define CHARGING_STATUS_RAGE 0xC
-
-#define PROTECTION_STATUS_REFLECT 0x1
-#define PROTECTION_STATUS_SAFEGUARD 0x2
-#define PROTECTION_STATUS_LIGHT_SCREEN 0x3
-#define PROTECTION_STATUS_COUNTER 0x4
-#define PROTECTION_STATUS_MAGIC_COAT 0x5
-#define PROTECTION_STATUS_WISH 0x6
-#define PROTECTION_STATUS_PROTECT 0x7
-#define PROTECTION_STATUS_MIRROR_COAT 0x8
-#define PROTECTION_STATUS_ENDURE 0x9
-#define PROTECTION_STATUS_MINI_COUNTER 0xA
-#define PROTECTION_STATUS_MIRROR_MOVE 0xB
-#define PROTECTION_STATUS_CONVERSION_2 0xC
-#define PROTECTION_STATUS_VITAL_THROW 0xD
-#define PROTECTION_STATUS_MIST 0xE
-
-#define WAITING_STATUS_CURSED 1
-#define WAITING_STATUS_DECOY 2
-#define WAITING_STATUS_SNATCH 3
-
-#define LINKED_STATUS_LEECH_SEED 1
-#define LINKED_STATUS_DESTINY_BOND 2
-
-#define MOVE_STATUS_SURE_SHOT 1
-#define MOVE_STATUS_WHIFFER 2
-#define MOVE_STATUS_SET_DAMAGE 3
-#define MOVE_STATUS_FOCUS_ENERGY 4
-
-#define ITEM_STATUS_LONG_TOSS 1
-#define ITEM_STATUS_PIERCE 2
-
-#define TRANSFORM_STATUS_INVISIBLE 1
-#define TRANSFORM_STATUS_TRANSFORMED 2
-#define TRANSFORM_STATUS_MOBILE 3
-
-#define EYESIGHT_STATUS_BLINKER 1
-#define EYESIGHT_STATUS_CROSS_EYED 2
-#define EYESIGHT_STATUS_EYEDROPS 3
-
+#define VOLATILE_STATUS_NONE 0
 #define VOLATILE_STATUS_CRINGING 1
 #define VOLATILE_STATUS_CONFUSED 2
 #define VOLATILE_STATUS_PAUSED 3
@@ -81,8 +32,100 @@
 #define VOLATILE_STATUS_ENCORE 6
 #define VOLATILE_STATUS_INFATUATED 7
 
+#define CHARGING_STATUS_NONE 0
+#define CHARGING_STATUS_BIDE 1
+#define CHARGING_STATUS_SOLARBEAM 2
+#define CHARGING_STATUS_SKY_ATTACK 3
+#define CHARGING_STATUS_RAZOR_WIND 4
+#define CHARGING_STATUS_FOCUS_PUNCH 5
+#define CHARGING_STATUS_SKULL_BASH 6
+#define CHARGING_STATUS_FLY 7
+#define CHARGING_STATUS_BOUNCE 8
+#define CHARGING_STATUS_DIVE 9
+#define CHARGING_STATUS_DIG 10
+#define CHARGING_STATUS_CHARGE 11
+#define CHARGING_STATUS_RAGE 12
+
+#define PROTECTION_STATUS_NONE 0
+#define PROTECTION_STATUS_REFLECT 1
+#define PROTECTION_STATUS_SAFEGUARD 2
+#define PROTECTION_STATUS_LIGHT_SCREEN 3
+#define PROTECTION_STATUS_COUNTER 4
+#define PROTECTION_STATUS_MAGIC_COAT 5
+#define PROTECTION_STATUS_WISH 6
+#define PROTECTION_STATUS_PROTECT 7
+#define PROTECTION_STATUS_MIRROR_COAT 8
+#define PROTECTION_STATUS_ENDURE 9
+#define PROTECTION_STATUS_MINI_COUNTER 10
+#define PROTECTION_STATUS_MIRROR_MOVE 11
+#define PROTECTION_STATUS_CONVERSION_2 12
+#define PROTECTION_STATUS_VITAL_THROW 13
+#define PROTECTION_STATUS_MIST 14
+
+#define WAITING_STATUS_NONE 0
+#define WAITING_STATUS_CURSED 1
+#define WAITING_STATUS_DECOY 2
+#define WAITING_STATUS_SNATCH 3
+
+#define LINKED_STATUS_NONE 0
+#define LINKED_STATUS_LEECH_SEED 1
+#define LINKED_STATUS_DESTINY_BOND 2
+
+#define MOVE_STATUS_NONE 0
+#define MOVE_STATUS_SURE_SHOT 1
+#define MOVE_STATUS_WHIFFER 2
+#define MOVE_STATUS_SET_DAMAGE 3
+#define MOVE_STATUS_FOCUS_ENERGY 4
+
+#define ITEM_STATUS_NONE 0
+#define ITEM_STATUS_LONG_TOSS 1
+#define ITEM_STATUS_PIERCE 2
+
+#define TRANSFORM_STATUS_NONE 0
+#define TRANSFORM_STATUS_INVISIBLE 1
+#define TRANSFORM_STATUS_TRANSFORMED 2
+#define TRANSFORM_STATUS_MOBILE 3
+
+#define EYESIGHT_STATUS_NONE 0
+#define EYESIGHT_STATUS_BLINKER 1
+#define EYESIGHT_STATUS_CROSS_EYED 2
+#define EYESIGHT_STATUS_EYEDROPS 3
+
+#define MUZZLED_STATUS_NONE 0
+#define MUZZLED_STATUS_MUZZLED 1
+
 #define TARGETING_DECOY_NONE 0
 #define TARGETING_DECOY_TEAM 1
 #define TARGETING_DECOY_WILD 2
 
+#define STATUS_SPRITE_SLEEPLESS (1 << 0)
+#define STATUS_SPRITE_BURNED (1 << 1)
+#define STATUS_SPRITE_POISONED (1 << 2)
+#define STATUS_SPRITE_BADLY_POISONED (1 << 3)
+#define STATUS_SPRITE_CONFUSED (1 << 4)
+#define STATUS_SPRITE_COWERING (1 << 5)
+#define STATUS_SPRITE_TAUNTED (1 << 6)
+#define STATUS_SPRITE_ENCORE (1 << 7)
+#define STATUS_SPRITE_SHIELD_BLUE (1 << 8) // REFLECT, COUNTER, MINI_COUNTER, MIST
+#define STATUS_SPRITE_SHIELD_RED (1 << 9) // SAFEGUARD, MIRROR_COAT
+#define STATUS_SPRITE_SHIELD_YELLOW (1 << 10) // LIGHT_SCREEN, MAGIC_COAT
+#define STATUS_SPRITE_SHIELD_GREEN (1 << 11) // PROTECT, MIRRO_MOVE, VITAL_THROW
+#define STATUS_SPRITE_ENDURE (1 << 12)
+#define STATUS_SPRITE_LOWHP (1 << 13)
+#define STATUS_SPRITE_CURSED (1 << 14)
+#define STATUS_SPRITE_SNATCH (1 << 15)
+#define STATUS_SPRITE_SURE_SHOT (1 << 16)
+#define STATUS_SPRITE_WHIFFER (1 << 17)
+#define STATUS_SPRITE_SET_DAMAGE (1 << 18)
+#define STATUS_SPRITE_FOCUS_ENERGY (1 << 19)
+#define STATUS_SPRITE_BLINKER (1 << 20)
+#define STATUS_SPRITE_CROSS_EYED (1 << 21)
+#define STATUS_SPRITE_EYEDROPS (1 << 22)
+#define STATUS_SPRITE_MUZZLED (1 << 23)
+#define STATUS_SPRITE_GRUDGE (1 << 24)
+#define STATUS_SPRITE_EXPOSED (1 << 25)
+#define STATUS_SPRITE_SLEEP (1 << 26)
+#define STATUS_SPRITE_STAT_DOWN (1 << 27)
+#define STATUS_SPRITE_FROZEN (1 << 28)
+
 #endif
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h
index 25291e45..b894a2f5 100644
--- a/include/dungeon_entity.h
+++ b/include/dungeon_entity.h
@@ -215,7 +215,9 @@ struct DungeonEntityData
     /* 0x1FA */ u8 mobileTurnTimer; // When a Pokémon can pass through walls in a hallway, this counts up to 200 before the Pokémon turns in a random direction.
     u8 fill1FB;
     /* 0x1FC */ u16 expGainedInTurn; // Used to accumulate experience when multiple enemies are defeated in one turn.
-    u8 fill1FE[0x208 - 0x1FE];
+    u8 fill1FE[0x200 - 0x1FE];
+    /* 0x200 */ u32 statusSprites;
+    u32 unk204;
 };
 
 // Used for Pokémon, items, and traps.
diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h
index 5cb0c8aa..1d0a971c 100644
--- a/include/dungeon_global_data.h
+++ b/include/dungeon_global_data.h
@@ -80,7 +80,11 @@ struct DungeonGlobalData
     /* 0x1358C */ struct DungeonEntity *wildPokemon[DUNGEON_MAX_WILD_POKEMON];
     /* 0x135CC */ struct DungeonEntity *allPokemon[DUNGEON_MAX_POKEMON]; // Contains both team and wild Pokémon
     /* 0x1361C */ struct DungeonEntity *clientPokemon[2]; // Not sure how large this array is.
-    u8 fill13624[0x181F8 - 0x13624];
+    u8 fill13624[0x181E8 - 0x13624];
+    /* 0x181E8 */ struct Position posScreenWorld;
+    /* 0x181EC */ struct Position prevPosScreenWorld;
+    /* 0x181F0 */ struct Position posScreenPixel;
+    /* 0x181F4 */ struct Position prevPosScreenPixel;
     /* 0x181F8 */ struct DungeonEntity *leader; // Pointer to the team leader.
     u32 unk181FC;
     u32 unk18200;
diff --git a/include/dungeon_pokemon_sprites.h b/include/dungeon_pokemon_sprites.h
new file mode 100644
index 00000000..50595ea6
--- /dev/null
+++ b/include/dungeon_pokemon_sprites.h
@@ -0,0 +1,39 @@
+#ifndef GUARD_DUNGEON_POKEMON_SPRITES_H
+#define GUARD_DUNGEON_POKEMON_SPRITES_H
+
+#include "map.h"
+
+struct DungeonPokemonStatusSprite
+{
+    u32 status;
+    u32 frame;
+};
+
+struct DungeonPokemonSprite
+{
+    /* 0x0000 */ u8 exists;
+    /* 0x0004 */ u32 id;
+    /* 0x0008 */ u16 species; // Or sprite ID?
+    /* 0x000A */ u16 unkA;
+    /* 0x000C */ u32 status;
+    /* 0x0010 */ u8 visible;
+    /* 0x0011 */ u8 unk11;
+    /* 0x0014 */ struct Position pos;
+    /* 0x0018 */ struct Position statusOffsets[2];
+    /* 0x0020 */ u32 unk20;
+    /* 0x0024 */ u32 unk24;
+    /* 0x0028 */ struct DungeonPokemonStatusSprite statusSprites[2];
+    /* 0x0038 */ u8 unk38;
+    /* 0x003C */ u16 unk3C;
+    /* 0x003E */ u16 unk3E;
+}
+
+struct DungeonPokemonSprites
+{
+    u32 frame;
+    struct DungeonPokemonSprites sprites[22];
+};
+
+extern struct DungeonPokemonSprites *gDungeonPokemonSprites;
+
+#endif
diff --git a/sym_ewram2.txt b/sym_ewram2.txt
index add077c3..c23cc46d 100644
--- a/sym_ewram2.txt
+++ b/sym_ewram2.txt
@@ -146,7 +146,7 @@ gUnknown_203B0D0 = .; /* 203B0D0 */
 gUnknown_203B0D4 = .; /* 203B0D4 */
 	. += 0x4;
 
-gUnknown_203B0D8 = .; /* 203B0D8 */
+gDungeonPokemonSprites = .; /* 203B0D8 */
 	. += 0x4;
 
 gUnknown_203B0DC = .; /* 203B0DC */