From 9e4b4e31f815c644f7baf790bd7837f29407aa75 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 14 Feb 2025 19:02:35 +1000 Subject: [PATCH] Name some miscellaneous constants --- src/game/bg.c | 2 +- src/game/bondgun.c | 12 ++++++------ src/game/chraicommands.c | 16 ++++++++-------- src/game/propsnd.c | 4 ++-- src/include/constants.h | 28 +++++++++++++--------------- src/lib/lib_17ce0.c | 12 ++++++------ src/lib/snd.c | 24 ++++++++++++------------ src/setups/setupdish.c | 2 +- src/setups/setuplip.c | 2 +- 9 files changed, 50 insertions(+), 52 deletions(-) diff --git a/src/game/bg.c b/src/game/bg.c index a949836b3..0975d1ac6 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -5528,7 +5528,7 @@ void bg_process_queue_item(struct bgqueueitem *item) } // Reusing the side variable as a bboxisvalid variable - if (g_BgPortals[portalnum].flags & PORTALFLAG_02) { + if (g_BgPortals[portalnum].flags & PORTALFLAG_USEROOMBOX) { newbox.xmin = item->screenbox.xmin; newbox.ymin = item->screenbox.ymin; newbox.xmax = item->screenbox.xmax; diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 7158a7ed3..6ef3359fe 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -9335,13 +9335,13 @@ struct ammotype g_AmmoTypes[] = { { TICKS(18000), 0, 0 }, // AMMOTYPE_CLOAK { 4, 0, 0 }, // AMMOTYPE_BOOST { 200, 0, 0 }, // AMMOTYPE_PSYCHOSIS - { 2, 0, 0 }, // AMMOTYPE_17 + { 2, 0, 0 }, // AMMOTYPE_BOMBCASE { 10, 0, 0 }, // AMMOTYPE_BUG { 10, 0, 0 }, // AMMOTYPE_MICROCAMERA { 10, 0, 0 }, // AMMOTYPE_PLASTIQUE - { 1000, 0, 0 }, // AMMOTYPE_1B + { 1000, 0, 0 }, // AMMOTYPE_WATCHLASER { 10, 0, 0 }, // AMMOTYPE_1C - { 50, 0, -1 }, // AMMOTYPE_1D + { 50, 0, -1 }, // AMMOTYPE_TANK { 1, 0, 0 }, // AMMOTYPE_TOKEN { 200, 0, 0 }, // AMMOTYPE_1F { 10, 0, 0 }, // AMMOTYPE_ECM_MINE @@ -9449,13 +9449,13 @@ bool bgun_ammotype_allows_unlimited_ammo(u32 ammotype) } break; case AMMOTYPE_PSYCHOSIS: - case AMMOTYPE_17: + case AMMOTYPE_BOMBCASE: case AMMOTYPE_BUG: case AMMOTYPE_MICROCAMERA: case AMMOTYPE_PLASTIQUE: - case AMMOTYPE_1B: + case AMMOTYPE_WATCHLASER: case AMMOTYPE_1C: - case AMMOTYPE_1D: + case AMMOTYPE_TANK: case AMMOTYPE_TOKEN: case AMMOTYPE_1F: case AMMOTYPE_ECM_MINE: diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 40f7b05b7..bfe11327d 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -6608,13 +6608,13 @@ s16 g_GuardQuipBank[][4] = { { QUIP_GOFORALARM, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, { QUIP_SURPRISED, SFXNUM_025B_M0_WHAT_THE, SFXNUM_025C_M0_WHO_THE, SFXNUM_025C_M0_WHO_THE }, { QUIP_INSPECTBODY, SFXNUM_026E_M0_ARE_YOU_OKAY, SFXNUM_026F_M0_GOT_A_MAN_DOWN, SFXNUM_0270_M0_HES_BOUGHT_IT }, - { QUIP_20, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, + { QUIP_UNDERFIRE, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, { QUIP_HITPLAYER, SFXNUM_0280_M0_GIVE_IT_UP, SFXNUM_0281_M0_SURRENDER_NOW, SFXNUM_0282_M0_TAKE_THAT }, { QUIP_MISSEDPLAYER1, SFXMAP_80F9_M0_DAMN_IT_MISSED, SFXMAP_80F9_M0_DAMN_IT_MISSED, SFXNUM_0287_M0_HOW_DID_I_MISS }, { QUIP_MISSEDPLAYER2, SFXMAP_80FA_M0_GODS_SAKE_SOMEONE_HIT_HER, SFXMAP_80FA_M0_GODS_SAKE_SOMEONE_HIT_HER, SFXNUM_0289_M0_SHES_A_TRICKY_ONE }, { QUIP_GOTOCOVER2, SFXNUM_028D_M0_TAKE_COVER, SFXNUM_028E_M0_ILL_COVER_YOU, SFXNUM_028F_M0_GET_DOWN }, { QUIP_DIE, SFXMAP_80FC_M0_YOU_BITCH, SFXMAP_80FD_M0_OH_MY_GOD, SFXNUM_02A2_M0_SHE_GOT_ME }, - { QUIP_26, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, + { QUIP_KILLEDPLAYER3, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, { QUIP_SEARCHSUCCESS, SFXNUM_0275_M0_I_SEE_HER, SFXNUM_0277_M0_THERE_SHE_IS, SFXNUM_0278_M0_THERE_MOVEMENT }, { QUIP_SEEEYESPY, SFXMAP_8167_M0_WHAT_THE_HELL, SFXNUM_04C9_M0_HELLO_THERE, SFXNUM_04CA_M0_WHATS_THIS }, { QUIP_GREETING, SFXMAP_815D_M0_HOWS_THINGS, SFXMAP_815E_M0_HEY_THERE, SFXMAP_815F_M0_HI_HOW_ARE_YOU }, @@ -6654,7 +6654,7 @@ s16 g_GuardQuipBank[][4] = { #else { QUIP_INSPECTBODY, SFXNUM_0313_M_NOOO, SFXMAP_8129_M1_NOOO, SFXNUM_0316_M1_HES_GONE }, #endif - { QUIP_20, SFXNUM_031C_M1_M2_LOOK_OUT_SHES_COMING, SFXNUM_031D_M1_M2_TAKE_COVER, SFXNUM_031E_M1_M2_LOOK_OUT_LOOK_OUT }, + { QUIP_UNDERFIRE, SFXNUM_031C_M1_M2_LOOK_OUT_SHES_COMING, SFXNUM_031D_M1_M2_TAKE_COVER, SFXNUM_031E_M1_M2_LOOK_OUT_LOOK_OUT }, { QUIP_HITPLAYER, SFXNUM_0356_M1_IM_JUST_TOO_GOOD, SFXNUM_0329_M1_YEAH_BABY, SFXNUM_0329_M1_YEAH_BABY }, { QUIP_MISSEDPLAYER1, SFXMAP_812B_M1_BLOODY_STUPID_GUN, SFXNUM_032F_M1_MY_GUN_ITS_USELESS, SFXMAP_812C_M1_DAMN_IT }, { QUIP_MISSEDPLAYER2, SFXNUM_0331_M1_STOP_DODGING, SFXNUM_0332_M1_SOMEONE_HIT_HER, SFXMAP_812D_M1_DAMN_SHES_GOOD }, @@ -6664,7 +6664,7 @@ s16 g_GuardQuipBank[][4] = { #else { QUIP_DIE, SFXNUM_034C_M_WAIL, SFXNUM_034D_M1_WHY_ME, SFXNUM_034E_M1_CHOKING }, #endif - { QUIP_26, SFXNUM_0355_M1_OUTSTANDING, SFXNUM_0356_M1_IM_JUST_TOO_GOOD, SFXNUM_0357_M1_YEEHAH_GOT_ONE }, + { QUIP_KILLEDPLAYER3, SFXNUM_0355_M1_OUTSTANDING, SFXNUM_0356_M1_IM_JUST_TOO_GOOD, SFXNUM_0357_M1_YEEHAH_GOT_ONE }, { QUIP_SEARCHSUCCESS, SFXNUM_031F_M1_OVER_THERE, SFXNUM_0320_M1_HALT, SFXNUM_0321_M1_FREEZE }, { QUIP_SEEEYESPY, SFXNUM_04CF_M1_WHAT_IS_IT, SFXNUM_04D0_M1_HOW_DID_THAT_GET_HERE, SFXNUM_04D1_M1_DONT_TOUCH_IT }, { QUIP_GREETING, SFXMAP_8163_M1_HI_THERE, SFXMAP_8163_M1_HI_THERE, SFXMAP_8164_M1_HOWS_THINGS }, @@ -6700,7 +6700,7 @@ s16 g_GuardQuipBank[][4] = { { QUIP_GOFORALARM, SFXNUM_0037, SFXNUM_0037, SFXNUM_0037 }, { QUIP_SURPRISED, SFXNUM_03C4_M2_HOW_THE, SFXNUM_03C5_M2_HEY, SFXNUM_03C6_M2_STOP }, { QUIP_INSPECTBODY, SFXNUM_03D9_M2_BODY_COUNTS_TOO_HIGH, SFXNUM_03DA_M2_I_NEVER_LIKED_HIM_ANYWAY, SFXNUM_03DB_M2_THAT_WAS_MY_BEST_FRIEND }, - { QUIP_20, SFXNUM_031C_M1_M2_LOOK_OUT_SHES_COMING, SFXNUM_031D_M1_M2_TAKE_COVER, SFXNUM_031E_M1_M2_LOOK_OUT_LOOK_OUT }, + { QUIP_UNDERFIRE, SFXNUM_031C_M1_M2_LOOK_OUT_SHES_COMING, SFXNUM_031D_M1_M2_TAKE_COVER, SFXNUM_031E_M1_M2_LOOK_OUT_LOOK_OUT }, { QUIP_HITPLAYER, SFXNUM_03ED_M2_SURRENDER_OR_DIE, SFXNUM_03EE_M2_I_HAVE_YOU_NOW, SFXNUM_03EF_M2_YOU_WANT_BEAT_ME }, { QUIP_MISSEDPLAYER1, SFXMAP_8136_M2_DAMN_MISSED_AGAIN, SFXNUM_03F4_M2_I_DONT_BELIEVE_IT, SFXMAP_8137_M2_DAMN_YOU }, { QUIP_MISSEDPLAYER2, SFXMAP_8138_M2_HELL_SHES_GOOD, SFXNUM_03F7_M2_STOP_MOVING, SFXNUM_03F8_M2_NO_ESCAPE_FOR_YOU }, @@ -6710,7 +6710,7 @@ s16 g_GuardQuipBank[][4] = { #else { QUIP_DIE, SFXNUM_0411_M_NOOO, SFXMAP_813C_M2_OH_GOD_IM_DYING, SFXNUM_0415_M2_I_DONT_WANT_TO_DIE }, #endif - { QUIP_26, SFXNUM_041B_M2_IM_THE_MAN, SFXNUM_041C_M2_BOY_THAT_WAS_CLOSE, SFXNUM_041D_M2_DID_YOU_SEE_THAT }, + { QUIP_KILLEDPLAYER3, SFXNUM_041B_M2_IM_THE_MAN, SFXNUM_041C_M2_BOY_THAT_WAS_CLOSE, SFXNUM_041D_M2_DID_YOU_SEE_THAT }, { QUIP_SEARCHSUCCESS, SFXNUM_03E4_M2_GET_HER, SFXNUM_03E5_M2_THERE_ATTACK, SFXNUM_03E6_M2_HEY_YOU_STOP }, { QUIP_SEEEYESPY, SFXNUM_04D5_M2_IS_IT_DANGEROUS, SFXNUM_04D6_M2_DONT_MOVE, SFXNUM_04D7_M2_STAY_BACK }, { QUIP_GREETING, SFXMAP_8165_M2_HELLO, SFXMAP_8165_M2_HELLO, SFXMAP_8166_M2_HEY_WHATS_UP }, @@ -6746,7 +6746,7 @@ s16 g_GuardQuipBank[][4] = { { QUIP_GOFORALARM, SFXNUM_03AA_F_GET_REINFORCEMENTS, SFXNUM_03AB_F_EVACUATE_THE_AREA, SFXNUM_03AC_F_RETREAT }, { QUIP_SURPRISED, SFXNUM_0037, SFXNUM_037B_F_HEY, SFXNUM_037C_F_HUH }, { QUIP_INSPECTBODY, SFXNUM_038D_F_UNIT_DOWN, SFXNUM_038D_F_UNIT_DOWN, SFXNUM_038D_F_UNIT_DOWN }, - { QUIP_20, SFXNUM_0384_F_TARGET_ATTACKING, SFXNUM_0385_F_UNDER_FIRE, SFXNUM_0387_F_WERE_UNDER_FIRE }, + { QUIP_UNDERFIRE, SFXNUM_0384_F_TARGET_ATTACKING, SFXNUM_0385_F_UNDER_FIRE, SFXNUM_0387_F_WERE_UNDER_FIRE }, { QUIP_HITPLAYER, SFXNUM_039A_F_DID_THAT_HURT, SFXNUM_039B_F_YOU_WANT_SOME_MORE, SFXNUM_0037 }, { QUIP_MISSEDPLAYER1, SFXNUM_039F_F_THIS_GUNS_USELESS, SFXNUM_0037, SFXNUM_03A1_F_STAND_STILL }, #if VERSION >= VERSION_NTSC_1_0 @@ -6756,7 +6756,7 @@ s16 g_GuardQuipBank[][4] = { #endif { QUIP_GOTOCOVER2, SFXNUM_03A7_F_GO_FOR_IT, SFXNUM_0037, SFXNUM_03A9_F_RUN }, { QUIP_DIE, SFXNUM_03B7_F_WHY_ME, SFXNUM_03B8_F_NOO, SFXMAP_8131_F_MY_GOD }, - { QUIP_26, SFXNUM_03BE_F_IM_JUST_TOO_GOOD, SFXNUM_0037, SFXNUM_03C0_F_SUCH_A_WASTE }, + { QUIP_KILLEDPLAYER3, SFXNUM_03BE_F_IM_JUST_TOO_GOOD, SFXNUM_0037, SFXNUM_03C0_F_SUCH_A_WASTE }, { QUIP_SEARCHSUCCESS, SFXNUM_0381_F_GET_HER, SFXNUM_0382_F_HEY_YOU_COME_HERE, SFXNUM_0037 }, { QUIP_SEEEYESPY, 0, 0, 0 }, { QUIP_GREETING, SFXNUM_0037, SFXNUM_0396_F_COME_ON, SFXNUM_0037 }, diff --git a/src/game/propsnd.c b/src/game/propsnd.c index 1e199eabe..db34a79c9 100644 --- a/src/game/propsnd.c +++ b/src/game/propsnd.c @@ -802,7 +802,7 @@ s16 ps_create(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pa channel->flags2 |= PSFLAG2_RESPONDHELLO; } - if (g_AudioConfigs[confignum].flags & AUDIOCONFIGFLAG_08) { + if (g_AudioConfigs[confignum].flags & AUDIOCONFIGFLAG_IGNOREROOMS) { if (channel->targetvol == -1) { channel->targetvol = channel->maxvol; } @@ -814,7 +814,7 @@ s16 ps_create(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pa channel->flags2 |= PSFLAG2_OFFENSIVE; } - if (g_AudioConfigs[confignum].flags & AUDIOCONFIGFLAG_20) { + if (g_AudioConfigs[confignum].flags & AUDIOCONFIGFLAG_AMBIENT) { channel->flags2 |= PSFLAG2_AMBIENT; } diff --git a/src/include/constants.h b/src/include/constants.h index a5d77af0c..1190f0c74 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -263,13 +263,13 @@ #define AMMOTYPE_CLOAK 0x14 #define AMMOTYPE_BOOST 0x15 #define AMMOTYPE_PSYCHOSIS 0x16 -#define AMMOTYPE_17 0x17 +#define AMMOTYPE_BOMBCASE 0x17 #define AMMOTYPE_BUG 0x18 #define AMMOTYPE_MICROCAMERA 0x19 #define AMMOTYPE_PLASTIQUE 0x1a -#define AMMOTYPE_1B 0x1b +#define AMMOTYPE_WATCHLASER 0x1b #define AMMOTYPE_1C 0x1c -#define AMMOTYPE_1D 0x1d +#define AMMOTYPE_TANK 0x1d #define AMMOTYPE_TOKEN 0x1e #define AMMOTYPE_1F 0x1f #define AMMOTYPE_ECM_MINE 0x20 @@ -316,11 +316,11 @@ #define ATTACKFLAG_NOVERTICAL 0x0100 // don't aim up/down #define ATTACKFLAG_AIMATTARGET 0x0200 // aim/shoot at whatever is in the chr's `target` field -#define AUDIOCONFIGFLAG_SPECIALPAN 0x01 +#define AUDIOCONFIGFLAG_SPECIALPAN 0x01 #define AUDIOCONFIGFLAG_RESPONDHELLO 0x04 -#define AUDIOCONFIGFLAG_08 0x08 +#define AUDIOCONFIGFLAG_IGNOREROOMS 0x08 #define AUDIOCONFIGFLAG_OFFENSIVE 0x10 -#define AUDIOCONFIGFLAG_20 0x20 +#define AUDIOCONFIGFLAG_AMBIENT 0x20 #define AUDIOCONFIGFLAG_40 0x40 #define AWARD_MOSTSUICIDAL 0x00000001 @@ -721,7 +721,7 @@ #define COVERCRITERIA_1000 0x1000 #define COVERCRITERIA_2000 0x2000 #define COVERCRITERIA_DISTTOFETCHPROP 0x4000 -#define COVERCRITERIA_ALLOWSOFT 0x8000 +#define COVERCRITERIA_ALLOWSOFT 0x8000 #define COVERFLAG_OUTOFSIGHT 0x0001 #define COVERFLAG_INUSE 0x0002 @@ -3447,10 +3447,10 @@ #define PDMODEPROP_DAMAGE 2 #define PDMODEPROP_ACCURACY 3 -#define PORTALFLAG_CLOSED 0x01 // Due to door being closed, or player is too far from glass -#define PORTALFLAG_02 0x02 -#define PORTALFLAG_FORCEOPEN 0x04 // Glass is destroyed, or door is freed -#define PORTALFLAG_SKIP 0x08 // DD tower exterior - don't bother processing these +#define PORTALFLAG_CLOSED 0x01 // Due to door being closed, or player is too far from glass +#define PORTALFLAG_USEROOMBOX 0x02 // Use room's screenbox instead of calculating portal's screenbox +#define PORTALFLAG_FORCEOPEN 0x04 // Glass is destroyed, or door is freed +#define PORTALFLAG_SKIP 0x08 // DD tower exterior - don't bother processing these #define PRESETANIM_TALK0 0 #define PRESETANIM_TALK1 1 @@ -3571,13 +3571,13 @@ #define QUIP_17 17 #define QUIP_SURPRISED 18 #define QUIP_INSPECTBODY 19 -#define QUIP_20 20 +#define QUIP_UNDERFIRE 20 #define QUIP_HITPLAYER 21 #define QUIP_MISSEDPLAYER1 22 #define QUIP_MISSEDPLAYER2 23 #define QUIP_GOTOCOVER2 24 #define QUIP_DIE 25 -#define QUIP_26 26 +#define QUIP_KILLEDPLAYER3 26 #define QUIP_SEARCHSUCCESS 27 #define QUIP_SEEEYESPY 28 #define QUIP_GREETING 29 @@ -4132,8 +4132,6 @@ #define TEAM_04 0x04 #define TEAM_ALLY 0x10 #define TEAM_20 0x20 -#define TEAM_22 0x22 -#define TEAM_32 0x32 #define TEAM_NONCOMBAT 0x80 #define TELEPORTSTATE_INACTIVE 0 diff --git a/src/lib/lib_17ce0.c b/src/lib/lib_17ce0.c index 227d06f06..e70f2f277 100644 --- a/src/lib/lib_17ce0.c +++ b/src/lib/lib_17ce0.c @@ -36,19 +36,19 @@ void portal_get_centre(s32 portalnum, struct coord *avg) } #if VERSION < VERSION_NTSC_1_0 -bool portal00018e34nb(s32 portalnum) +bool portal_uses_room_box(s32 portalnum) { - return g_BgPortals[portalnum].flags & PORTALFLAG_02; + return g_BgPortals[portalnum].flags & PORTALFLAG_USEROOMBOX; } -void portal00018e54nb(s32 portalnum) +void portal_set_use_room_box(s32 portalnum) { - g_BgPortals[portalnum].flags |= PORTALFLAG_02; + g_BgPortals[portalnum].flags |= PORTALFLAG_USEROOMBOX; } -void portal00018e74nb(s32 portalnum) +void portal_unset_use_room_box(s32 portalnum) { - g_BgPortals[portalnum].flags &= (~PORTALFLAG_02 & 0xff); + g_BgPortals[portalnum].flags &= (~PORTALFLAG_USEROOMBOX & 0xff); } #endif diff --git a/src/lib/snd.c b/src/lib/snd.c index 59546f663..ef0e1c32e 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -649,25 +649,25 @@ struct audiorussmapping g_AudioRussMappings[] = { struct audioconfig g_AudioConfigs[] = { { /* 0*/ 200, 1000, 1200, -1, 100, -1, 0, 0 }, - { /* 1*/ 400, 2500, 3000, -1, 100, 48, 0, AUDIOCONFIGFLAG_20 }, + { /* 1*/ 400, 2500, 3000, -1, 100, 48, 0, AUDIOCONFIGFLAG_AMBIENT }, { /* 2*/ 400, 2500, 3000, -1, 100, -1, 0, AUDIOCONFIGFLAG_OFFENSIVE }, - { /* 3*/ 400, 2500, 3000, -1, 100, 48, 0, AUDIOCONFIGFLAG_OFFENSIVE | AUDIOCONFIGFLAG_20 }, + { /* 3*/ 400, 2500, 3000, -1, 100, 48, 0, AUDIOCONFIGFLAG_OFFENSIVE | AUDIOCONFIGFLAG_AMBIENT }, { /* 4*/ 200, 1000, 1200, -1, 100, -1, 0, 0 }, { /* 5*/ 200, 1000, 1200, -1, 100, -1, 0, 0 }, { /* 6*/ 200, 1000, 1200, -1, 100, -1, 0, 0 }, - { /* 7*/ 1000, 3500, 4000, -1, 100, -1, 120, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /* 8*/ 1000, 2500, 3000, -1, 100, -1, 30, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /* 9*/ 1000, 3500, 4000, -1, 100, -1, 120, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /*10*/ 1000, 2500, 3000, -1, 100, -1, 30, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /*11*/ 1600, 3000, 3500, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /*12*/ 400, 1100, 1400, -1, 100, -1, 140, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, - { /*13*/ 400, 1100, 1400, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, + { /* 7*/ 1000, 3500, 4000, -1, 100, -1, 120, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /* 8*/ 1000, 2500, 3000, -1, 100, -1, 30, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /* 9*/ 1000, 3500, 4000, -1, 100, -1, 120, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /*10*/ 1000, 2500, 3000, -1, 100, -1, 30, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /*11*/ 1600, 3000, 3500, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /*12*/ 400, 1100, 1400, -1, 100, -1, 140, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, + { /*13*/ 400, 1100, 1400, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, { /*14*/ 300, 1200, 1250, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*15*/ 500, 1800, 1900, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*16*/ 1000, 2700, 2900, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*17*/ 1500, 3000, 4000, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*18*/ 2500, 4900, 5000, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, - { /*19*/ 5500, 5600, 5700, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_20 }, + { /*19*/ 5500, 5600, 5700, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_AMBIENT }, { /*20*/ 20, 400, 500, -1, 100, -1, 0, 0 }, { /*21*/ 300, 1700, 2000, -1, 100, -1, 0, 0 }, { /*22*/ 600, 3500, 5000, -1, 100, -1, 0, 0 }, @@ -686,7 +686,7 @@ struct audioconfig g_AudioConfigs[] = { { /*35*/ 1000, 3500, 5000, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*36*/ 50, 225, 250, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*37*/ 50, 225, 250, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, - { /*38*/ 2000, 2500, 2700, -1, 50, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_08 }, + { /*38*/ 2000, 2500, 2700, -1, 50, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN | AUDIOCONFIGFLAG_IGNOREROOMS }, { /*39*/ 300, 1000, 1200, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, { /*40*/ 300, 1000, 1200, -1, 100, -1, 100, AUDIOCONFIGFLAG_SPECIALPAN }, { /*41*/ 600, 1500, 1800, -1, 100, -1, 0, AUDIOCONFIGFLAG_SPECIALPAN }, @@ -713,7 +713,7 @@ struct audioconfig g_AudioConfigs[] = { { /*60*/ 400, 2500, 3000, -1, 100, -1, 0, AUDIOCONFIGFLAG_RESPONDHELLO }, #if VERSION >= VERSION_NTSC_1_0 { /*61*/ 300, 900, 1100, -1, 100, -1, 0, 0 }, - { /*62*/ 1000, 2500, 3000, -1, 100, -1, 0, AUDIOCONFIGFLAG_08 }, + { /*62*/ 1000, 2500, 3000, -1, 100, -1, 0, AUDIOCONFIGFLAG_IGNOREROOMS }, { /*63*/ 400, 1000, 1200, -1, 100, -1, 0, 0 }, #endif }; diff --git a/src/setups/setupdish.c b/src/setups/setupdish.c index 27ee8e796..7e99f5886 100644 --- a/src/setups/setupdish.c +++ b/src/setups/setupdish.c @@ -823,7 +823,7 @@ u8 func0428_colleague10[] = { u8 func1001_set_jo_team[] = { yield - set_chr_team(CHR_BOND, TEAM_32) + set_chr_team(CHR_BOND, TEAM_ENEMY | TEAM_ALLY | TEAM_20) set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/setups/setuplip.c b/src/setups/setuplip.c index e823c3621..69d420928 100644 --- a/src/setups/setuplip.c +++ b/src/setups/setuplip.c @@ -1079,7 +1079,7 @@ s32 path14[] = { u8 func1400_give_datauplinks[] = { yield - set_chr_team(CHR_ANTI, TEAM_22) + set_chr_team(CHR_ANTI, TEAM_ENEMY | TEAM_20) give_object_to_chr(OBJ_DATAUPLINK_BOND, CHR_BOND) give_object_to_chr(OBJ_DATAUPLINK_COOP, CHR_COOP) set_ailist(CHR_SELF, GAILIST_REBUILD_GROUPS)