Some review changes

This commit is contained in:
Eduardo Quezada 2024-05-18 10:40:09 -04:00
parent 569749f9c2
commit 73a13e5dd4
5 changed files with 15 additions and 13 deletions

View file

@ -1629,9 +1629,7 @@ void FreeSpritePaletteByTag(u16 tag)
{ {
u8 index = IndexOfSpritePaletteTag(tag); u8 index = IndexOfSpritePaletteTag(tag);
if (index != 0xFF) if (index != 0xFF)
{
sSpritePaletteTags[index] = TAG_NONE; sSpritePaletteTags[index] = TAG_NONE;
}
} }
void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables)

View file

@ -419,7 +419,7 @@
#define OBJ_EVENT_PAL_TAG_EMOTES 0x8002 #define OBJ_EVENT_PAL_TAG_EMOTES 0x8002
// Not a real OW palette tag; used for the white flash applied to followers // Not a real OW palette tag; used for the white flash applied to followers
#define OBJ_EVENT_PAL_TAG_WHITE (OBJ_EVENT_PAL_TAG_NONE - 1) #define OBJ_EVENT_PAL_TAG_WHITE (OBJ_EVENT_PAL_TAG_NONE - 1)
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF #define OBJ_EVENT_PAL_TAG_NONE 0x11FF
// This + localId is used as the tileTag // This + localId is used as the tileTag
// for compressed graphicsInfos // for compressed graphicsInfos

View file

@ -131,15 +131,16 @@ struct TypeInfo
//u16 arceusForm; //u16 arceusForm;
}; };
struct FollowerMsgInfo { struct FollowerMsgInfo
{
const u8 *text; const u8 *text;
const u8 *script; const u8 *script;
}; };
struct FollowerMessagePool struct FollowerMessagePool
{ {
const struct FollowerMsgInfo * messages; const struct FollowerMsgInfo *messages;
const u8 * script; const u8 *script;
u16 length; u16 length;
}; };

View file

@ -17,21 +17,25 @@ enum {
}; };
// Can be either 3 bytes, a u16 and a byte, or a 24-bit value // Can be either 3 bytes, a u16 and a byte, or a 24-bit value
union __attribute__((packed)) MsgConditionData { union __attribute__((packed)) MsgConditionData
{
u8 bytes[3]; u8 bytes[3];
struct __attribute__((packed)) { struct __attribute__((packed))
{
u16 hw; u16 hw;
u8 b; u8 b;
} split; } split;
u32 raw:24; u32 raw:24;
}; // size = 0x3 }; // size = 0x3
struct __attribute__((packed)) MsgCondition { struct __attribute__((packed)) MsgCondition
{
u32 type:8; u32 type:8;
union MsgConditionData data; union MsgConditionData data;
}; // size = 0x4 }; // size = 0x4
struct FollowerMsgInfoExtended { struct FollowerMsgInfoExtended
{
const u8 *text; const u8 *text;
const u8 *script; const u8 *script;

View file

@ -2189,10 +2189,9 @@ bool8 ScrCmd_playmoncry(struct ScriptContext *ctx)
return FALSE; return FALSE;
} }
bool8 ScrFunc_playfirstmoncry(struct ScriptContext *ctx) bool8 ScrFunc_playfirstmoncry(struct ScriptContext *ctx)
{ {
u16 species = GetMonData(GetFirstLiveMon(), MON_DATA_SPECIES); PlayCry_Script(GetMonData(GetFirstLiveMon(), MON_DATA_SPECIES), CRY_MODE_NORMAL);
PlayCry_Script(species, 0);
return FALSE; return FALSE;
} }