diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-06-18 17:02:50 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 17:02:50 +1000 |
| commit | 0a55ca0b403a6d77a1f9234527cc219994b642e6 (patch) | |
| tree | fd237d744830bbb1829ed723683a05a75ea77d99 /src/code | |
| parent | 587d12e3cbb2a1ffb6774c0823c54ce0e80a579b (diff) | |
Document Song of Time Cutscenes (Test6) (#1269)
* import docs
* cleanup
* more eventinf docs
* more cleanup
* more docs
* more docs
* more docs
* sZoraBarrierEnvLighting
* comments
* PR Suggestion
* fix bss
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_kankyo.c | 8 | ||||
| -rw-r--r-- | src/code/z_play.c | 4 | ||||
| -rw-r--r-- | src/code/z_sram_NES.c | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 2191498a3..9346af59a 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -90,13 +90,13 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD538.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD59C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_LerpAmbientColor.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD5E0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_LerpDiffuseColor.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD654.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_LerpFogColor.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD698.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Environment_LerpFog.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/get_days_elapsed.s") diff --git a/src/code/z_play.c b/src/code/z_play.c index 9063c9151..d86fd90d6 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -2090,8 +2090,8 @@ void Play_Init(GameState* thisx) { s32 scene; if ((gSaveContext.respawnFlag == -4) || (gSaveContext.respawnFlag == -0x63)) { - if (CHECK_EVENTINF(EVENTINF_27)) { - CLEAR_EVENTINF(EVENTINF_27); + if (CHECK_EVENTINF(EVENTINF_TRIGGER_DAYTELOP)) { + CLEAR_EVENTINF(EVENTINF_TRIGGER_DAYTELOP); STOP_GAMESTATE(&this->state); SET_NEXT_GAMESTATE(&this->state, DayTelop_Init, sizeof(DayTelopState)); return; diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index fa690758c..f03d38e45 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -489,38 +489,38 @@ void Sram_SaveEndOfCycle(PlayState* play) { gSaveContext.eventInf[i] = 0; } - CLEAR_EVENTINF(EVENTINF_70); - CLEAR_EVENTINF(EVENTINF_71); - CLEAR_EVENTINF(EVENTINF_72); - CLEAR_EVENTINF(EVENTINF_73); - CLEAR_EVENTINF(EVENTINF_74); + CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_RUPEES); + CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO); + CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO); + CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO); + CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_ARROW_AMMO); if (gSaveContext.save.saveInfo.playerData.rupees != 0) { - SET_EVENTINF(EVENTINF_70); + SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_RUPEES); } if (INV_CONTENT(ITEM_BOMB) == ITEM_BOMB) { item = INV_CONTENT(ITEM_BOMB); if (AMMO(item) != 0) { - SET_EVENTINF(EVENTINF_71); + SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO); } } if (INV_CONTENT(ITEM_NUT) == ITEM_NUT) { item = INV_CONTENT(ITEM_NUT); if (AMMO(item) != 0) { - SET_EVENTINF(EVENTINF_72); + SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO); } } if (INV_CONTENT(ITEM_STICK) == ITEM_STICK) { item = INV_CONTENT(ITEM_STICK); if (AMMO(item) != 0) { - SET_EVENTINF(EVENTINF_73); + SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO); } } if (INV_CONTENT(ITEM_BOW) == ITEM_BOW) { item = INV_CONTENT(ITEM_BOW); if (AMMO(item) != 0) { - SET_EVENTINF(EVENTINF_74); + SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_ARROW_AMMO); } } |