mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-29 10:40:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document Song of Time Cutscenes (Test6) (#1269)

Browse Source 
* import docs

* cleanup

* more eventinf docs

* more cleanup

* more docs

* more docs

* more docs

* sZoraBarrierEnvLighting

* comments

* PR Suggestion

* fix bss
This commit is contained in:
engineer124
2023-06-18 17:02:50 +10:00
committed by GitHub
parent 587d12e3cb
commit 0a55ca0b40
20 changed files with 841 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_kankyo.c
+4 -4
View File
@@ -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")
src/code/z_play.c
+2 -2
View File
@@ -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;
src/code/z_sram_NES.c
+10 -10
View File
@@ -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);
}
}