github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-introduce TASK_GET_MEMBER|TASK_SET_MEMBER, fix build

Browse Source
This commit is contained in:
JaceCear committed 2025-12-06 22:27:31 +01:00
1 parent 73dc4e851a
commit 4f463fcbe1
2 files changed
+10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/lib/m4a/m4a_internal.h
+4
View File
@@ -39,8 +39,12 @@
#if COLLECT_RINGS_ROM
#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_07884 | (15 << SOUND_MODE_MASVOL_SHIFT) | (4 << SOUND_MODE_MAXCHN_SHIFT))
#else
#if (ENGINE == ENGINE_3)
#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (10 << SOUND_MODE_MASVOL_SHIFT) | (6 << SOUND_MODE_MAXCHN_SHIFT))
#else
#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT) | (5 << SOUND_MODE_MAXCHN_SHIFT))
#endif
#endif
#define TONEDATA_TYPE_CGB 0x07
#define TONEDATA_TYPE_FIX 0x08
include/task.h
+6
View File
@@ -102,6 +102,12 @@ struct IwramNode {
#define TASK_HEAP_SIZE ((0x881) * sizeof(uintptr_t))
// TODO: DO NOT USE, unless ABSOLUTELY necessary for matching!!!
#define TASK_GET_MEMBER(_taskType, _task, _memberType, _memberName) \
*(_memberType *)((unsigned char *)TASK_DATA(_task) + offsetof(_taskType, _memberName))
#define TASK_SET_MEMBER(_taskType, _task, _memberType, _memberName, _value) \
TASK_GET_MEMBER(_taskType, _task, _memberType, _memberName) = (_value);
extern struct Task gTasks[MAX_TASK_NUM];
extern struct Task gEmptyTask;
extern struct Task *gTaskPtrs[MAX_TASK_NUM];