Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-24 23:17:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of Dungeon_ax

Browse Source
This commit is contained in:
Mateon1 2024-09-22 14:38:40 +02:00
parent 49acc1a1eb
commit 915cdb9fd3
No known key found for this signature in database
GPG Key ID: 6A6067123E4CAF6E
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/sprite.h
View File

@ -64,16 +64,6 @@ typedef struct EntitySpriteInfo
u32 unk38;
} EntitySpriteInfo;
// size: ?
typedef struct Dungeon_ax
{
u32 unk0;
u32 **unk4;
u8 fill8[0xC - 0x8];
u32 unkC;
u32 unk10;
} Dungeon_ax;
void AddSprite(SpriteOAM *, s32, UnkSpriteMem *, unkStruct_2039DB0 *);
void BlinkSavingIcon(void);
void CopySpritesToOam(void);
@ -85,8 +75,8 @@ void sub_8005180(void);
void sub_8005304(void);
void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, u16 *, bool8);
void AxResInitFile(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8);
void AxResInit(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8);
void AxResInit(EntitySpriteInfo *, axmain *, u32, u32, u32, u32, bool8);
void AxResInitUnorientedFile(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8);
void RunAxAnimationFrame(struct axPokemon *);
#endif // GUARD_SPRITE_H
#endif // GUARD_SPRITE_H

22
src/sprite.c
View File

@ -34,7 +34,7 @@ UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite is done
#endif
static void RegisterSpriteParts_80052BC(UnkSpriteMem *);
static void AxResInitUnoriented(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, bool8);
static void AxResInitUnoriented(EntitySpriteInfo *, axmain *, u32, u32, u32, bool8);
void InitSprites(void)
{
@ -903,10 +903,10 @@ void sub_800533C(ax_pose **a0, UnkSpriteMem **a1, axdata1 *a2, u16 *spriteMasks,
void AxResInitFile(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6)
{
AxResInit(a0, (Dungeon_ax *)a1->data, a2, a3, a4, spriteAnimIndex, a6);
AxResInit(a0, (axmain *)a1->data, a2, a3, a4, spriteAnimIndex, a6);
}
void AxResInit(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6)
void AxResInit(EntitySpriteInfo *a0, axmain *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6)
{
a0->unk0 = 0x8000;
if (a6)
@ -922,19 +922,19 @@ void AxResInit(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32
a0->unk14 = 0;
a0->unk18 = 0;
a0->spriteAnimationCounter2 = 0;
a0->spriteBaseForDirection = a1->unk4[a2][direction];
a0->spriteBaseForDirection = (u32)a1->animations[a2][direction];
a0->spriteGlobalIndex = a0->spriteBaseForDirection;
a0->unk34 = a1->unk0;
a0->unk38 = a1->unkC;
a0->unk30 = a1->unk10;
a0->unk34 = (u32)a1->poses;
a0->unk38 = (u32)a1->spriteData;
a0->unk30 = (u32)a1->palettes;
}
void AxResInitUnorientedFile(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
{
AxResInitUnoriented(a0, (Dungeon_ax *)a1->data, a2, a3, spriteAnimIndex, a5);
AxResInitUnoriented(a0, (axmain *)a1->data, a2, a3, spriteAnimIndex, a5);
}
static void AxResInitUnoriented(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
static void AxResInitUnoriented(EntitySpriteInfo *a0, axmain *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
{
a0->unk0 = 0x8000;
if (a5)
@ -950,9 +950,9 @@ static void AxResInitUnoriented(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u3
a0->unk14 = 0;
a0->unk18 = 0;
a0->spriteAnimationCounter2 = 0;
a0->spriteBaseForDirection = a1->unk4[a2][0];
a0->spriteBaseForDirection = (u32)a1->animations[a2][0];
a0->spriteGlobalIndex = a0->spriteBaseForDirection;
a0->unk34 = a1->unk0;
a0->unk34 = (u32)a1->poses;
a0->unk30 = 0;
}