Renamed EntityInfo.fillF3 to unkF3

This commit is contained in:
AnonymousRandomPerson 2024-07-19 21:01:14 -04:00
parent 9258833539
commit 1db3e9172e
5 changed files with 15 additions and 15 deletions

View File

@ -34,7 +34,7 @@ typedef struct DungeonPokemonSprite
typedef struct DungeonPokemonSprites
{
/* 0x0 */ u32 frame;
/* 0x4 */ struct DungeonPokemonSprite sprites[22];
/* 0x4 */ DungeonPokemonSprite sprites[22];
} DungeonPokemonSprites;
void sub_800F958(s32 dungeonSpriteID, Position *pos, Position *statusOffsets, u32 a3);

View File

@ -66,7 +66,7 @@ typedef struct AITarget
} AITarget;
typedef struct Sleep
typedef struct Sleep
{
/* 0x0 */ u8 sleep;
/* 0x1 */ u8 sleepTurns;
@ -77,7 +77,7 @@ typedef struct NonVolatile
/* 0x0 */ u8 nonVolatileStatus;
/* 0x1 */ u8 nonVolatileStatusTurns;
/* 0x2 */ u8 nonVolatileStatusDamageCountdown;
/* 0x3 */ u8 unk4;
/* 0x3 */ u8 unk4;
} NonVolatile;
typedef struct Immobilize
@ -107,7 +107,7 @@ typedef struct Protection
/* 0x1 */ u8 protectionStatusTurns;
} Protection;
typedef struct Waiting
typedef struct Waiting
{
/* 0xC8 */ u8 waitingStatus;
/* 0xC9 */ bool8 enemyDecoy; // True if the Pokémon is a decoy and a wild Pokémon (i.e., not an allied Pokémon).
@ -116,7 +116,7 @@ typedef struct Waiting
/* 0xCC */ u8 curseDamageCountdown;
} Waiting;
typedef struct Linked
typedef struct Linked
{
/* 0xD0 */ u8 linkedStatus;
/* 0xD4 */ u32 unkD4;
@ -126,7 +126,7 @@ typedef struct Linked
} Linked;
typedef struct MoveStatus
typedef struct MoveStatus
{
/* 0xDC */ u8 moveStatus;
/* 0xDD */ u8 moveStatusTurns;
@ -143,13 +143,13 @@ typedef struct TransformStatus
/* 0xE5 */ u8 transformStatusTurns;
} TransformStatus;
typedef struct EyesightStatus
typedef struct EyesightStatus
{
/* 0xE8 */ u8 eyesightStatus;
/* 0xE9 */ u8 eyesightStatusTurns;
} EyesightStatus;
typedef struct Muzzled
typedef struct Muzzled
{
/* 0xEC */ bool8 muzzled;
/* 0xED */ u8 muzzledTurns;
@ -234,7 +234,7 @@ typedef struct EntityInfo
/* 0xF0 */ bool8 powerEars;
/* 0xF1 */ bool8 scanning;
/* 0xF2 */ bool8 stairSpotter;
u8 fillF3;
/* 0xF3 */ bool8 unkF3;
/* 0xF4 */ bool8 grudge;
/* 0xF5 */ bool8 exposed;
/* 0xF6 */ bool8 isColorChanged;

View File

@ -109,8 +109,8 @@ void sub_80427AC(void)
entity = gDungeon->allPokemon[i];
if (EntityExists(entity)) {
enInfo = entity->info;
if (enInfo->fillF3) {
enInfo->fillF3 = 0;
if (enInfo->unkF3) {
enInfo->unkF3 = FALSE;
sub_80429A0(entity);
if (!enInfo->isNotTeamMember) {
SetMessageArgument(gAvailablePokemonNames, entity, 0);

View File

@ -125,7 +125,7 @@ bool8 sub_8072CF4(Entity *entity)
gUnknown_203B434 = 1;
info = entity->info;
info->useHeldItem = FALSE;
info->fillF3 = 0;
info->unkF3 = FALSE;
gDungeon->unkB8 = entity;
if (gUnknown_80F58F4[(info->action).action][0] != 0) {
if (info->isTeamLeader) {

View File

@ -257,7 +257,7 @@ void sub_8080E0C(unkStruct_8094924 *param_1,Entity *param_2)
bool8 *pbStack_58;
bool8 *pbStack_54;
bool8 *pbStack_50;
u8 *puStack_4c;
bool8 *puStack_4c;
bool8 *pbStack_48;
bool8 *pbStack_44;
bool8 *pbStack_40;
@ -351,7 +351,7 @@ void sub_8080E0C(unkStruct_8094924 *param_1,Entity *param_2)
pbStack_58 = &info->powerEars;
pbStack_54 = &info->scanning;
pbStack_50 = &info->stairSpotter;
puStack_4c = &info->fillF3;
puStack_4c = &info->unkF3;
pbStack_48 = &info->grudge;
puStack_34 = &info->unkFB;
pbStack_44 = &info->exposed;
@ -483,7 +483,7 @@ void sub_8081454(unkStruct_8094924 *param_1)
for(iVar4 = 0; iVar4 < 8; iVar4++)
{
SavePosition(param_1,&gDungeon->unkE220[iVar4]);
}
}
sub_80830F8(param_1,&gDungeon->unkE240);
sub_80830F8(param_1,&gDungeon->unkE250);
sub_808312C(param_1,&gDungeon->unkE260);