Dump and document status sprites

2 files changed, 187 insertions, 71 deletions

diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index ff0c5dc..74eb4a9 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 7ad38cb..036c63a 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 gUnknown_80F66B4
-gUnknown_80F66B4: @ 80F66B4
-	.incbin "baserom.gba", 0xF66B4, 0x14
-
-	.global gUnknown_80F66C8
-gUnknown_80F66C8: @ 80F66C8
-	.incbin "baserom.gba", 0xF66C8, 0x20
-
-	.global gUnknown_80F66E8
-gUnknown_80F66E8: @ 80F66E8
-	.incbin "baserom.gba", 0xF66E8, 0x20
-
-	.global gUnknown_80F6708
-gUnknown_80F6708: @ 80F6708
-	.incbin "baserom.gba", 0xF6708, 0x34
-
-	.global gUnknown_80F673C
-gUnknown_80F673C: @ 80F673C
-	.incbin "baserom.gba", 0xF673C, 0x3C
-
-	.global gUnknown_80F6778
-gUnknown_80F6778: @ 80F6778
-	.incbin "baserom.gba", 0xF6778, 0x10
-
-	.global gUnknown_80F6788
-gUnknown_80F6788: @ 80F6788
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.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 gUnknown_80F67A8
-gUnknown_80F67A8: @ 80F67A8
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.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 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 gUnknown_80F67D4
-gUnknown_80F67D4: @ 80F67D4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x80, 0x00
+	.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 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 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 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 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 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 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 gStatusSpriteMasks_LinkedStatus
+gStatusSpriteMasks_LinkedStatus: @ 80F6788
+    .4byte 0 @ LINKED_STATUS_NONE
+    .4byte 0 @ LINKED_STATUS_LEECH_SEED
+    .4byte 0 @ LINKED_STATUS_DESTINY_BOND
+
+	.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 gStatusSpriteMasks_ItemStatus
+gStatusSpriteMasks_ItemStatus: @ 80F67A8
+    .4byte 0 @ ITEM_STATUS_NONE
+    .4byte 0 @ ITEM_STATUS_LONG_TOSS
+    .4byte 0 @ ITEM_STATUS_PIERCE
+
+	.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 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 gStatusSpriteMasks_MuzzledStatus
+gStatusSpriteMasks_MuzzledStatus: @ 80F67D4
+    .4byte 0                     @ MUZZLED_STATUS_NONE
+    .4byte STATUS_SPRITE_MUZZLED @ MUZZLED_STATUS_MUZZLED
 
 	.global gUnknown_80F67DC
 gUnknown_80F67DC: @ 80F67DC