diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2024-05-20 16:25:45 -0600 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 20:16:46 -0300 |
| commit | 7c801d33d995869cbba2d0127919128489ae7d2a (patch) | |
| tree | a7220a77f2fccbfada34a014731eef21853c7596 /include | |
| parent | 6248c70be1dd61b87ce9a5a9a65f3666f814a47c (diff) | |
Repo upstreamed
Diffstat (limited to 'include')
| -rw-r--r-- | include/mods.h | 9 | ||||
| -rw-r--r-- | include/sf64audio_external.h | 4 | ||||
| -rw-r--r-- | include/sf64dma.h | 20 | ||||
| -rw-r--r-- | include/sfx.h | 2 |
4 files changed, 24 insertions, 11 deletions
diff --git a/include/mods.h b/include/mods.h index 3581d98d..d354dd07 100644 --- a/include/mods.h +++ b/include/mods.h @@ -12,6 +12,15 @@ // #define MODS_BOOT_STATE 4 // map /** + * Quick Boot: + * Define this variable to a game state to boot into that + * state. Two presets (map and main menu) are provided. + * For the full list of game states, see sf64thread.h. +*/ +// #define MODS_BOOT_STATE 3 // main menu +// #define MODS_BOOT_STATE 4 // map + +/** * Level Select: * Use the D-Pad to select a level. Press L to start in * an advanced level phase (warp zone or Andross fight). diff --git a/include/sf64audio_external.h b/include/sf64audio_external.h index eea7762b..034c6006 100644 --- a/include/sf64audio_external.h +++ b/include/sf64audio_external.h @@ -18,8 +18,8 @@ void Audio_SetVolume(u8 audioType, u8 volume); void Audio_FadeOutAll(u8 fadeoutTime); void Audio_SetAudioSpec(u8 unused, u16 specParam); -#define AUDIO_SET_SPEC(sfxLayout, spec) Audio_SetAudioSpec(0, ((sfxLayout) << 8) | (spec)) -#define AUDIO_SET_SPEC_ALT(sfxLayout, spec) Audio_SetAudioSpec((sfxLayout), ((sfxLayout) << 8) | (spec)) +#define AUDIO_SET_SPEC(sfxLayout, spec) // Audio_SetAudioSpec(0, ((sfxLayout) << 8) | (spec)) +#define AUDIO_SET_SPEC_ALT(sfxLayout, spec) // Audio_SetAudioSpec((sfxLayout), ((sfxLayout) << 8) | (spec)) // used by sys or related void AudioLoad_Init(void); diff --git a/include/sf64dma.h b/include/sf64dma.h index e5b04f4a..99389881 100644 --- a/include/sf64dma.h +++ b/include/sf64dma.h @@ -68,17 +68,21 @@ #define SEGMENT_BSS_END(segment) (segment ## _BSS_END) #define SEGMENT_BSS_SIZE(segment) ((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment)) -#define ROM_SEGMENT(file) { SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) } +#define NO_SEGMENT \ + { NULL, NULL } -#define OVERLAY_OFFSETS(file) \ - { { SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, \ - { SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \ - { SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, \ - { SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) } } +#define OVERLAY_OFFSETS(file) \ + NO_OVERLAY -#define NO_SEGMENT { NULL, NULL } +#define NO_OVERLAY \ + { \ + { NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { \ + NULL, NULL \ + } \ + } -#define NO_OVERLAY { NO_SEGMENT, NO_SEGMENT, NO_SEGMENT, NO_SEGMENT } +#define ROM_SEGMENT(file) \ + NO_SEGMENT u8 Load_SceneSetup(u8 sceneId, u8 sceneSetup); void Load_InitDmaAndMsg(void); diff --git a/include/sfx.h b/include/sfx.h index 37394ccc..522f3ca5 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -34,7 +34,7 @@ void Audio_PlayPauseSfx(u8 active); void Audio_PlayMapMenuSfx(u8 active); void Audio_KillAllSfx(void); -#define AUDIO_PLAY_SFX(sfxId, srcPos, token) (Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb)) +#define AUDIO_PLAY_SFX(sfxId, srcPos, token) //(Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb)) #define SFX_FLAG_18 (1 << 18) // makes distance ignore z position? probably more #define SFX_FLAG_19 (1 << 19) |