diff --git a/include/packets/GameInf.h b/include/packets/GameInf.h index 0665bc8..34c5793 100644 --- a/include/packets/GameInf.h +++ b/include/packets/GameInf.h @@ -5,7 +5,7 @@ struct PACKED GameInf : Packet { GameInf() : Packet() {this->mType = PacketType::GAMEINF; mPacketSize = sizeof(GameInf) - sizeof(Packet);}; - bool4 is2D = false; + bool1 is2D = false; u8 scenarioNo = -1; char stageName[0x40] = {}; diff --git a/include/packets/HackCapInf.h b/include/packets/HackCapInf.h index c01ea60..fc92534 100644 --- a/include/packets/HackCapInf.h +++ b/include/packets/HackCapInf.h @@ -6,6 +6,6 @@ struct PACKED HackCapInf : Packet { HackCapInf() : Packet() {this->mType = PacketType::HACKCAPINF; mPacketSize = sizeof(HackCapInf) - sizeof(Packet);}; sead::Vector3f capPos; sead::Quatf capQuat; - bool4 isCapVisible = false; + bool1 isCapVisible = false; char capAnim[PACKBUFSIZE] = {}; }; \ No newline at end of file diff --git a/include/packets/ShineCollect.h b/include/packets/ShineCollect.h index 5153c57..2e6bdad 100644 --- a/include/packets/ShineCollect.h +++ b/include/packets/ShineCollect.h @@ -5,5 +5,5 @@ struct PACKED ShineCollect : Packet { ShineCollect() : Packet() {this->mType = PacketType::SHINECOLL; mPacketSize = sizeof(ShineCollect) - sizeof(Packet);}; int shineId = -1; - bool4 isGrand = false; + bool1 isGrand = false; }; \ No newline at end of file diff --git a/include/packets/TagInf.h b/include/packets/TagInf.h index 9adba20..bd5a64e 100644 --- a/include/packets/TagInf.h +++ b/include/packets/TagInf.h @@ -11,7 +11,7 @@ enum TagUpdateType : u8 { struct PACKED TagInf : Packet { TagInf() : Packet() { this->mType = PacketType::TAGINF; mPacketSize = sizeof(TagInf) - sizeof(Packet);}; TagUpdateType updateType; - bool4 isIt = false; + bool1 isIt = false; u8 seconds; u16 minutes; }; \ No newline at end of file diff --git a/include/types.h b/include/types.h index ebcbc23..397a50c 100644 --- a/include/types.h +++ b/include/types.h @@ -18,7 +18,9 @@ typedef signed int s32; typedef int64_t s64; typedef __int128_t s128; -typedef u32 bool4; // guaranteed to be 4 bytes, 'bool' is impl. defined +// bool size is implementation defined, so use these where it's important +typedef u8 bool1; +typedef u32 bool4; typedef float f32; typedef double f64;