From b37e5caf9a22da6840ae2e288fe29a10dcea9ea0 Mon Sep 17 00:00:00 2001
From: RavePossum <ravepossum@proton.me>
Date: Sun, 23 Feb 2025 09:19:58 -0500
Subject: [PATCH] Move PokemonSpriteShadow to pokemon sprite struct def header

---
 include/struct_defs/pokemon_sprite.h       | 16 +++++++++++++++-
 include/struct_defs/struct_02007C7C_sub2.h | 19 -------------------
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 include/struct_defs/struct_02007C7C_sub2.h

diff --git a/include/struct_defs/pokemon_sprite.h b/include/struct_defs/pokemon_sprite.h
index 6bcc54efc4..cb8e3f29a7 100644
--- a/include/struct_defs/pokemon_sprite.h
+++ b/include/struct_defs/pokemon_sprite.h
@@ -7,7 +7,6 @@
 
 #include "struct_defs/sprite_animation_frame.h"
 #include "struct_defs/struct_02007C7C_sub1.h"
-#include "struct_defs/struct_02007C7C_sub2.h"
 
 typedef struct PokemonSprite PokemonSprite;
 
@@ -24,6 +23,21 @@ typedef struct PokemonSpriteTemplate {
     u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots.
 } PokemonSpriteTemplate;
 
+typedef struct PokemonSpriteShadow {
+    u16 plttSlot : 2;
+    u16 shouldAdjustX : 1;
+    u16 shouldAdjustY : 1;
+    u16 isAffine : 1;
+    u16 size : 2;
+    u16 padding_00 : 9;
+    s8 height;
+    u8 padding_03;
+    s16 x;
+    s16 y;
+    s16 xOffset;
+    s16 yOffset;
+} PokemonSpriteShadow;
+
 struct PokemonSprite {
     u32 unk_00_0 : 1;
     u32 unk_00_1 : 6;
diff --git a/include/struct_defs/struct_02007C7C_sub2.h b/include/struct_defs/struct_02007C7C_sub2.h
deleted file mode 100644
index dbfebdff15..0000000000
--- a/include/struct_defs/struct_02007C7C_sub2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_02007C7C_SUB2_H
-#define POKEPLATINUM_STRUCT_02007C7C_SUB2_H
-
-typedef struct {
-    u16 plttSlot : 2;
-    u16 shouldAdjustX : 1;
-    u16 shouldAdjustY : 1;
-    u16 isAffine : 1;
-    u16 size : 2;
-    u16 padding_00 : 9;
-    s8 height;
-    u8 padding_03;
-    s16 x;
-    s16 y;
-    s16 xOffset;
-    s16 yOffset;
-} PokemonSpriteShadow;
-
-#endif // POKEPLATINUM_STRUCT_02007C7C_SUB2_H