PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-14 20:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace int types in Retro code

Browse Source 
Retro seemingly avoided using the Dolphin
typedefs in most places, opting to use int/uint
instead. This likely means they didn't use
u8/s8/u16/s16/etc either.


Former-commit-id: 133326ae40
This commit is contained in:
Luke Street
2022-10-09 01:37:23 -04:00
parent f0ea5144ea
commit 7ca3a1c0bb
172 changed files with 1525 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/MetroidPrime/TGameTypes.hpp
View File

@@ -44,11 +44,11 @@ struct TEditorId {
CHECK_SIZEOF(TEditorId, 0x4)
struct TUniqueId {
u16 value;
ushort value;
TUniqueId(u16 version, u16 id) : value(((version & 0x3F) << 10) | (id & 0x3FF)) {}
u16 Value() const { return value & 0x3FF; }
u16 Version() const { return (value >> 10) & 0x3F; }
TUniqueId(ushort version, ushort id) : value(((version & 0x3F) << 10) | (id & 0x3FF)) {}
ushort Value() const { return value & 0x3FF; }
ushort Version() const { return (value >> 10) & 0x3F; }
bool operator==(const TUniqueId& other) const { return value == other.value; }
bool operator!=(const TUniqueId& other) const { return value != other.value; }
@@ -64,12 +64,12 @@ CHECK_SIZEOF(TUniqueId, 0x2)
// };
// CHECK_SIZEOF(TGameScriptId, 0x8)
typedef u16 TSfxId;
typedef ushort TSfxId;
static TSfxId InvalidSfxId = 0xFFFFu;
class CSegId {
private:
u8 x0_id;
uchar x0_id;
};
#define ALIGN_UP(x, a) (((x) + (a - 1)) & ~(a - 1))