diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2025-02-04 11:55:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 06:55:04 -0500 |
| commit | c028db03b47f8b38bc2a1b87569fd7fae0ea9067 (patch) | |
| tree | 99007ef3e69f69b4e6924ba54468adda49461565 /include | |
| parent | 6c06168e7212616ea08460d487a4b99e89a34108 (diff) | |
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "e8543312d"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "e8543312d"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* ique-cn OK
* Review suggestions
* Most suggestions
* git subrepo pull tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "81595ed1c"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "81595ed1c"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* Fix other versions
Diffstat (limited to 'include')
| -rw-r--r-- | include/tables/sequence_table.h | 2 | ||||
| -rw-r--r-- | include/tables/sfx/enemybank_table.h | 2 | ||||
| -rw-r--r-- | include/tables/sfx/environmentbank_table.h | 4 | ||||
| -rw-r--r-- | include/tables/sfx/itembank_table.h | 2 | ||||
| -rw-r--r-- | include/ultra64/message.h | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/include/tables/sequence_table.h b/include/tables/sequence_table.h index 3e8f13e5f..70ccfcbae 100644 --- a/include/tables/sequence_table.h +++ b/include/tables/sequence_table.h @@ -15,7 +15,7 @@ * - Argument 3: Cache load policy for the sequence (AudioCacheLoadType) * - Argument 4: Sequence flags */ -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 #define SEQ_0_FLAGS SEQ_FLAG_FANFARE #else #define SEQ_0_FLAGS SEQ_FLAG_FANFARE | SEQ_FLAG_ENEMY diff --git a/include/tables/sfx/enemybank_table.h b/include/tables/sfx/enemybank_table.h index de741033e..7cae1d788 100644 --- a/include/tables/sfx/enemybank_table.h +++ b/include/tables/sfx/enemybank_table.h @@ -334,7 +334,7 @@ /* 0x3942 */ DEFINE_SFX(CHAN_4EA8, NA_SE_EN_BALINADE_THUNDER, 0x34, 3, 0, 0) /* 0x3943 */ DEFINE_SFX(CHAN_415D, NA_SE_EN_BALINADE_BL_SPARK, 0x20, 2, 0, 0) /* 0x3944 */ DEFINE_SFX(CHAN_4184, NA_SE_EN_BALINADE_BL_DEAD, 0x34, 3, 0, 0) -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 /* 0x3945 */ DEFINE_SFX(CHAN_4E86, NA_SE_EN_BALINADE_BREAK2, 0x30, 3, 0, 0) #else /* 0x3945 */ DEFINE_SFX(CHAN_4E86, NA_SE_EN_BALINADE_BREAK2, 0x34, 3, 0, 0) diff --git a/include/tables/sfx/environmentbank_table.h b/include/tables/sfx/environmentbank_table.h index a2ecf23c0..b0d0fb62f 100644 --- a/include/tables/sfx/environmentbank_table.h +++ b/include/tables/sfx/environmentbank_table.h @@ -43,7 +43,7 @@ /* 0x281F */ DEFINE_SFX(CHAN_1B61, NA_SE_EV_TBOX_UNLOCK, 0x30, 0, 0, 0) /* 0x2820 */ DEFINE_SFX(CHAN_1B7D, NA_SE_EV_TBOX_OPEN, 0x30, 0, 0, 0) /* 0x2821 */ DEFINE_SFX(CHAN_1B93, NA_SE_SY_TIMER, 0xA0, 0, 0, SFX_FLAG_13 | SFX_FLAG_3) -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 /* 0x2822 */ DEFINE_SFX(CHAN_1BE9, NA_SE_EV_FLAME_IGNITION, 0x20, 2, 0, 0) #else /* 0x2822 */ DEFINE_SFX(CHAN_1BE9, NA_SE_EV_FLAME_IGNITION, 0x2D, 2, 0, 0) @@ -108,7 +108,7 @@ /* 0x285C */ DEFINE_SFX(CHAN_2374, NA_SE_EV_BLOCKSINK, 0x30, 2, 0, 0) /* 0x285D */ DEFINE_SFX(CHAN_2389, NA_SE_EV_CROWD, 0x30, 0, 0, SFX_FLAG_13 | SFX_FLAG_12 | SFX_FLAG_11) /* 0x285E */ DEFINE_SFX(CHAN_23A6, NA_SE_EV_WATER_LEVEL_DOWN, 0x30, 0, 0, 0) -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 /* 0x285F */ DEFINE_SFX(CHAN_23D5, NA_SE_EV_NAVY_VANISH, 0x30, 0, 0, 0) #else /* 0x285F */ DEFINE_SFX(CHAN_23D5, NA_SE_EV_NAVY_VANISH, 0x2C, 0, 0, 0) diff --git a/include/tables/sfx/itembank_table.h b/include/tables/sfx/itembank_table.h index ed2001a55..e74469cfe 100644 --- a/include/tables/sfx/itembank_table.h +++ b/include/tables/sfx/itembank_table.h @@ -28,7 +28,7 @@ /* 0x1810 */ DEFINE_SFX(CHAN_10A2, NA_SE_IT_BOOMERANG_FLY, 0x30, 0, 0, SFX_FLAG_10) /* 0x1811 */ DEFINE_SFX(CHAN_10D2, NA_SE_IT_SWORD_STRIKE, 0x40, 2, 0, 0) /* 0x1812 */ DEFINE_SFX(CHAN_10E6, NA_SE_IT_HAMMER_SWING, 0x30, 0, 1, 0) -#if OOT_VERSION < PAL_1_0 || PLATFORM_GC +#if OOT_VERSION < PAL_1_0 || !PLATFORM_N64 /* 0x1813 */ DEFINE_SFX(CHAN_10F4, NA_SE_IT_HOOKSHOT_REFLECT, 0x30, 0, 0, 0) #else /* 0x1813 */ DEFINE_SFX(CHAN_10F4, NA_SE_IT_HOOKSHOT_REFLECT, 0x20, 0, 0, 0) diff --git a/include/ultra64/message.h b/include/ultra64/message.h index dc89dc48e..9b02d4f9c 100644 --- a/include/ultra64/message.h +++ b/include/ultra64/message.h @@ -4,7 +4,11 @@ #define OS_MESG_NOBLOCK 0 #define OS_MESG_BLOCK 1 +#ifndef BBPLAYER #define OS_NUM_EVENTS 15 +#else +#define OS_NUM_EVENTS 31 +#endif #define OS_EVENT_SW1 0 /* CPU SW1 interrupt */ #define OS_EVENT_SW2 1 /* CPU SW2 interrupt */ |