From b8b983dd7fcc0870544c586bddda02bc85050f4c Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Tue, 28 Dec 2021 04:35:05 +1100 Subject: Nature Ambience Documentation (#1063) * Document nature ambience io data * Document nature ambience functions * Function headers * Doc storing main bgm for nature/miniboss bgm * Give temporary names to functions * small cleanup * add docs to clarify * Break up nature ambience channel io data for easier reading * Add info to where each nature ambience Id is used * Name environmental sequence functions * Use channel macros globally * Add nature enum, revert env name * Revert tough-to-name functions, use nature channel enum instead * Fill in remaining enums from sequence 1 * PR Suggestions * Improve macros * remove clang-format off * MINI_GAME_2 -> TIMED_MINI_GAME * Revert to generic name * Fix Spacing --- src/code/z_common_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code/z_common_data.c') diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index fbe01f7c7..216a5ac9a 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -9,7 +9,7 @@ void SaveContext_Init(void) { D_8015FA88 = 0; D_8015FA8C = 0; gSaveContext.seqId = (u8)NA_BGM_DISABLED; - gSaveContext.natureAmbienceId = 0xFF; + gSaveContext.natureAmbienceId = NATURE_ID_DISABLED; gSaveContext.forcedSeqId = NA_BGM_GENERAL_SFX; gSaveContext.nextCutsceneIndex = 0xFFEF; gSaveContext.cutsceneTrigger = 0; -- cgit v1.2.3