mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-23 05:59:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sync local changes

Browse Source
This commit is contained in:
Cuyler36
2026-07-14 11:49:34 -04:00
parent a28c6c8826
commit bea941ac2b
17 changed files with 1106 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+9
View File
@@ -11,6 +11,15 @@ extern "C" {
#define VOICE_MODE_CLICK 1
#define VOICE_MODE_SILENT 2
enum {
ROOM_TYPE_OTHER,
ROOM_TYPE_SMALL,
ROOM_TYPE_MEDIUM,
ROOM_TYPE_LARGE,
ROOM_TYPE_NUM
};
/* audio is monophonic */
#define MONO(id) ((id) | 0x1000)
#define SE_DIST_REVERB(id) ((id) | 0x2000)
include/jaudio_NES/audiocommon.h
+2 -2
View File
@@ -772,8 +772,8 @@ typedef enum SubtrackCmd {
SUBTRACK_CMD_VOICE_SET = 0xC1,
SUBTRACK_CMD_SET_DYNTBL = 0xC2,
SUBTRACK_CMD_LARGE_NOTE_ON = 0xC3,
SUBTRACK_CMD_LARGE_NOTE_OFF = 0xC4,
SUBTRACK_CMD_LARGE_NOTE_OFF = 0xC3,
SUBTRACK_CMD_LARGE_NOTE_ON = 0xC4,
SUBTRACK_CMD_JMP_DYNTBL = 0xC5,
SUBTRACK_CMD_SET_INSTRUMENT_BANK = 0xC6,
SUBTRACK_CMD_WRITE_GROUP_SEQ = 0xC7,
include/jaudio_NES/audioheaders.h
+1 -1
View File
@@ -8,6 +8,6 @@ extern ArcHeader AudioseqHeaderStart;
extern ArcHeader AudiobankHeaderStart;
extern ArcHeader AudiowaveHeaderStart;
extern ArcHeader AudiodataHeaderStart;
extern u16 AudiomapHeaderStart[];
extern u8 AudiomapHeaderStart[];
#endif
include/jaudio_NES/audiostruct.h
+2 -2
View File
@@ -839,11 +839,11 @@ typedef struct AudioGlobals {
/* 0x2854 */ ArcHeader* bank_header;
/* 0x2858 */ ArcHeader* wave_header;
/* 0x285C */ ArcHeader* data_header;
/* 0x2860 */ u16* map_header;
/* 0x2860 */ u8* map_header;
/* 0x2864 */ u16 num_sequences;
/* 0x2868 */ voiceinfo* voice_info;
/* 0x286C */ audioparams audio_params;
/* 0x2894 */ f32 _2894; /* tempo scale? */
/* 0x2894 */ f32 sample_to_update_delay_scale; /* tempo scale? */
/* 0x2898 */ s32 waveload_dma_buf0_size;
/* 0x289C */ s32 waveload_dma_buf1_size;
/* 0x28A0 */ u8 _28A0[16];
include/libforest/gbi_extensions.h
+20
View File
@@ -741,6 +741,10 @@ do { \
gsDPSetTextureImage_Dolphin(fmt, G_IM_SIZ_4b, w, h, timg), \
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, pal, ws, wt, ss, st)
#define gsDPLoadTextureBlock_8b_Dolphin(timg, fmt, w, h, pal, ws, wt, ss, st) \
gsDPSetTextureImage_Dolphin(fmt, G_IM_SIZ_8b, w, h, timg), \
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, pal, ws, wt, ss, st)
#define gDPLoadTextureBlock_4b_Dolphin(pkt, timg, fmt, w, h, pal, ws, wt, ss, st) \
do { \
gDPSetTextureImage_Dolphin(pkt, fmt, G_IM_SIZ_4b, w, h, timg); \
@@ -763,6 +767,22 @@ do { \
gsDPSetTextureImage_Dolphin(fmt, G_IM_SIZ_4b, w, h, timg), \
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, tile, pal, ws, wt, ss, st)
#define gsDPLoadMultiBlock_8b_Dolphin(timg, tile, fmt, w, h, pal, ws, wt, ss, st) \
gsDPSetTextureImage_Dolphin(fmt, G_IM_SIZ_8b, w, h, timg), \
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, tile, pal, ws, wt, ss, st)
#define gDPLoadMultiBlock_4b_Dolphin(pkt, timg, tile, fmt, w, h, pal, ws, wt, ss, st) \
do { \
gDPSetTextureImage_Dolphin(pkt, fmt, G_IM_SIZ_4b, w, h, timg); \
gDPSetTile_Dolphin(pkt, G_DOLPHIN_TLUT_DEFAULT_MODE, tile, pal, ws, wt, ss, st); \
} while (0)
#define gDPLoadMultiBlock_8b_Dolphin(pkt, timg, tile, fmt, w, h, pal, ws, wt, ss, st) \
do { \
gDPSetTextureImage_Dolphin(pkt, fmt, G_IM_SIZ_8b, w, h, timg); \
gDPSetTile_Dolphin(pkt, G_DOLPHIN_TLUT_DEFAULT_MODE, tile, pal, ws, wt, ss, st); \
} while (0)
#define gsSPNTriangles_Independ(n) \
{{ \
_SHIFTL(G_TRIN_INDEPEND, 24, 8) | _SHIFTL(n-1, 17, 7), 0 \
include/m_collision_bg.h
+1 -1
View File
@@ -460,7 +460,7 @@ extern int mCoBG_CheckHole(xyz_t pos);
#if VERSION >= VER_GAFU01_00
extern int mCoBG_CheckAirSwing(xyz_t pos);
#else
extern int mCoBG_CheckAirSwing(xyz_t pos);
extern int mCoBG_CheckSkySwing(xyz_t pos);
#endif
extern int mCoBG_CheckGrassX_ClData(mCoBG_Collision_u* col);
extern int mCoBG_CheckGrassX(const xyz_t* pos);