From b672617b2d076fb4746316d40fc74b8caa808e1b Mon Sep 17 00:00:00 2001 From: Mateon1 Date: Wed, 25 Sep 2024 12:04:50 +0200 Subject: [PATCH] Remove code_800F958.h, it's a duplicate --- include/code_800F958.h | 42 ------------------------------------------ src/code_800F958.c | 3 +-- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 include/code_800F958.h diff --git a/include/code_800F958.h b/include/code_800F958.h deleted file mode 100644 index b77c1cc56..000000000 --- a/include/code_800F958.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef GUARD_CODE_800F958_H -#define GUARD_CODE_800F958_H - -#include "structs/str_dungeon.h" - -// size: 0x8 -typedef struct DungeonPokemonStatusSprite -{ - /* 0x0 */ u32 status; - /* 0x4 */ u32 frame; -} DungeonPokemonStatusSprite; - -// size: 0x40 -typedef struct DungeonPokemonSprite -{ - /* 0x0 */ u8 exists; - /* 0x4 */ u32 id; - /* 0x8 */ u16 species; // Or sprite ID? - /* 0xA */ u16 unkA; - /* 0xC */ u32 status; - /* 0x10 */ u8 visible; - /* 0x11 */ u8 unk11; - /* 0x14 */ Position pos; - /* 0x18 */ Position statusOffsets[2]; - /* 0x20 */ u32 unk20; - /* 0x24 */ u32 unk24; - /* 0x28 */ DungeonPokemonStatusSprite statusSprites[2]; - /* 0x38 */ u8 unk38; - /* 0x3C */ u16 unk3C; - /* 0x3E */ u16 unk3E; -} DungeonPokemonSprite; - -// size: 0x584 -typedef struct DungeonPokemonSprites -{ - /* 0x0 */ u32 frame; - /* 0x4 */ DungeonPokemonSprite sprites[22]; -} DungeonPokemonSprites; - -void sub_800F958(s32 dungeonSpriteID, Position *pos, Position *statusOffsets, u32 a3); - -#endif diff --git a/src/code_800F958.c b/src/code_800F958.c index a76e80e9c..fbce67483 100644 --- a/src/code_800F958.c +++ b/src/code_800F958.c @@ -1,8 +1,7 @@ #include "global.h" -#include "code_800F958.h" +#include "dungeon_pokemon_sprites.h" #include "memory.h" -extern DungeonPokemonSprites *gDungeonPokemonSprites; extern DungeonPokemonSprite *NewDungeonPokemonSprite(void); extern DungeonPokemonSprite* GetDungeonPokemonSprite(s32 id);