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

Dungeon_Sub17B44 -> Dungeon_ax

Browse Source
This commit is contained in:
Kermalis 2023-08-27 22:43:47 -04:00
parent 5923df1f58
commit 34d1d0b9b2
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/code_805D8C8.h
View File

@ -3,8 +3,8 @@
#include "sprite.h"
extern struct Dungeon_Sub17B44 *sub_80687D0(s16);
/*struct Dungeon_Sub17B44 *sub_80687D0(s16 species)
extern struct Dungeon_ax *sub_80687D0(s16);
/*struct Dungeon_ax *sub_80687D0(s16 species)
{
s32 species32 = species;
return gDungeon->sub17B44[species32];

2
include/dungeon_entity.h
View File

@ -272,7 +272,7 @@ struct Entity
// gets assigned the current counter value as its spawn index.
/* 0x26 */ u16 spawnGenID;
/* 0x28*/ struct EntitySpriteInfo spriteInfo;
struct Dungeon_Sub17B44 *unk64;
struct Dungeon_ax *unk64;
s16 unk68;
u8 unk6A;
u8 unk6B;

2
include/dungeon_global_data.h
View File

@ -199,7 +199,7 @@ struct Dungeon
/* 0x17B38 */ u32 unk17B38;
/* 0x17B3C */ u32 unk17B3C;
u8 fill17B40[0x17B44 - 0x17B40];
struct Dungeon_Sub17B44 *sub17B44[MONSTER_MAX]; // Assuming MONSTER_MAX since the highest value I've seen read is MONSTER_DECOY
struct Dungeon_ax *sub17B44[MONSTER_MAX]; // Assuming MONSTER_MAX since the highest value I've seen read is MONSTER_DECOY
u8 fill181E0[0x181E8 - 0x181E0];
/* 0x181E8 */ struct Position cameraPos;
/* 0x181EC */ struct Position cameraPosMirror;

12
include/sprite.h
View File

@ -65,7 +65,7 @@ struct EntitySpriteInfo
};
// size: ?
struct Dungeon_Sub17B44_Sub4
struct Dungeon_ax_Sub4
{
u32 unk0;
u32 **unk4;
@ -75,10 +75,10 @@ struct Dungeon_Sub17B44_Sub4
};
// size: ?
struct Dungeon_Sub17B44
struct Dungeon_ax
{
u8 fill0[0x4 - 0x0];
struct Dungeon_Sub17B44_Sub4 *unk4;
struct Dungeon_ax_Sub4 *unk4;
};
void AddSprite(struct SpriteOAM *, s32, struct UnkSpriteMem *, struct unkStruct_2039DB0 *);
@ -90,9 +90,9 @@ void SetSavingIconCoords(struct Position *);
void sub_8004E8C(struct unkStruct_2039DB0 *);
void sub_8005180(void);
void sub_8005304(void);
void sub_80053AC(struct EntitySpriteInfo *, struct Dungeon_Sub17B44 *, u32, u32, u32, u32, bool8);
void sub_80053D0(struct EntitySpriteInfo *, struct Dungeon_Sub17B44_Sub4 *, u32, u32, u32, u32, bool8);
void sub_800543C(struct EntitySpriteInfo *, struct Dungeon_Sub17B44 *, u32, u32, u32, bool8);
void sub_80053AC(struct EntitySpriteInfo *, struct Dungeon_ax *, u32, u32, u32, u32, bool8);
void sub_80053D0(struct EntitySpriteInfo *, struct Dungeon_ax_Sub4 *, u32, u32, u32, u32, bool8);
void sub_800543C(struct EntitySpriteInfo *, struct Dungeon_ax *, u32, u32, u32, bool8);
void sub_80054BC(struct axPokemon *);
#endif // GUARD_SPRITE_H

2
src/code_8077274_1.c
View File

@ -244,7 +244,7 @@ void sub_8078E18(struct Entity * pokemon, struct Entity * target)
s16 apparentID_s16;
s32 index;
struct EntityInfo *entityInfo;
struct Dungeon_Sub17B44 *iVar9;
struct Dungeon_ax *iVar9;
struct PokemonStruct *auStack544[128];
if (!EntityExists(target))

10
src/sprite.c
View File

@ -20,7 +20,7 @@ extern struct unkStruct_20266B0 *gUnknown_203B074;
extern void nullsub_3(s32, s32);
void RegisterSpriteParts_80052BC(struct UnkSpriteMem *);
void sub_800545C(struct EntitySpriteInfo *, struct Dungeon_Sub17B44_Sub4 *, u32, u32, u32, bool8);
void sub_800545C(struct EntitySpriteInfo *, struct Dungeon_ax_Sub4 *, u32, u32, u32, bool8);
void InitSprites(void)
{
@ -886,12 +886,12 @@ void sub_800533C(struct ax_pose **a0, struct UnkSpriteMem **a1, struct axdata1 *
}
}
void sub_80053AC(struct EntitySpriteInfo *a0, struct Dungeon_Sub17B44 *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6)
void sub_80053AC(struct EntitySpriteInfo *a0, struct Dungeon_ax *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6)
{
sub_80053D0(a0, a1->unk4, a2, a3, a4, spriteAnimIndex, a6);
}
void sub_80053D0(struct EntitySpriteInfo *a0, struct Dungeon_Sub17B44_Sub4 *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6)
void sub_80053D0(struct EntitySpriteInfo *a0, struct Dungeon_ax_Sub4 *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6)
{
a0->unk0 = 0x8000;
if (a6)
@ -914,12 +914,12 @@ void sub_80053D0(struct EntitySpriteInfo *a0, struct Dungeon_Sub17B44_Sub4 *a1,
a0->unk30 = a1->unk10;
}
void sub_800543C(struct EntitySpriteInfo *a0, struct Dungeon_Sub17B44 *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
void sub_800543C(struct EntitySpriteInfo *a0, struct Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
{
sub_800545C(a0, a1->unk4, a2, a3, spriteAnimIndex, a5);
}
void sub_800545C(struct EntitySpriteInfo *a0, struct Dungeon_Sub17B44_Sub4 *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
void sub_800545C(struct EntitySpriteInfo *a0, struct Dungeon_ax_Sub4 *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5)
{
a0->unk0 = 0x8000;
if (a5)