diff options
| author | Alexis Cooper <89618924+AACooper1@users.noreply.github.com> | 2026-10-10 20:53:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-10 19:53:23 -0700 |
| commit | bf6bd9d0d3a90fe2f8960e034fbfd328e8bdef22 (patch) | |
| tree | b832d64883088404e224b887b861e2287909b403 /include | |
| parent | 6e5fb93dde6368a6557fdd09ce9ae9309296670b (diff) | |
Document `EnToto` (#1887)
* Start documenting Toto
* Document EnToto_IsFacingPlayer and Unk2B6/isPlayerCancelingSoundCheck
* Rename EnTotoText to EnTotoSpeakData to align with EnTest3 (Kafei)
* Update gitignore
* Document some HandleTalk and SetupTalk functions similar to EnTest3
* Rename D_80BA502C to sEnTotoSpeakData1
* Document TalkState setup funcs
* Update gitignore, document talk state update functions (from En_Test3)
* Toto talk loop animations
* Update gitignore for functions.txt
* Document ActionFuncs
* Clean up remaining undocumented variables
* Clean up comments
* Run format.py and clean up result, and revert makefile changes
* Add missing newline at end of z_en_toto.h
* Clean up gitignore and other local stuff
* gitignore again
* Gitignore again again
* Gitignore again again again
* Restore old graphovl.py
* Update include/z64save.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Toto/z_en_toto.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Rename SetupAction and Action functions; fix block comments; create enum for TalkData
* move enum up so it's declared before it's used lol
* Change shouldCancelSoundCheck and ShouldPlaySoundCheckCompleteCutscene to bool
* Run format.py even though it makes the SpeakData array less readable yay
* Remove accidentally pushed files
* Enum for SpeakDataIndex
* SpeakDataIndex
* Index into SpeakData with enums
* Apply requested changes
* Apply clang-format
* Apply requested changes (rename SetPlayedFlags, add formsPlayed enum, fix a few missing enum replacements)
* Change enum to macros
* Apply more suggested changes
---------
Co-authored-by: AlexisACooper1 <alexis@lingualogica.net>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64cutscene.h | 2 | ||||
| -rw-r--r-- | include/z64save.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/z64cutscene.h b/include/z64cutscene.h index a7e19ebf5..e83b7c3b3 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -457,7 +457,7 @@ typedef enum { /* 0x20A */ CS_CMD_ACTOR_CUE_522, /* 0x20B */ CS_CMD_ACTOR_CUE_523, /* 0x20C */ CS_CMD_ACTOR_CUE_524, - /* 0x20D */ CS_CMD_ACTOR_CUE_525, + /* 0x20D */ CS_CMD_ACTOR_CUE_525, // Toto and Gorman interaction in Milk Bar /* 0x20E */ CS_CMD_ACTOR_CUE_526, /* 0x20F */ CS_CMD_ACTOR_CUE_527, /* 0x210 */ CS_CMD_ACTOR_CUE_528, diff --git a/include/z64save.h b/include/z64save.h index 0b06f2a8d..c25778742 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -1102,7 +1102,7 @@ typedef enum { #define WEEKEVENTREG_49_20 PACK_WEEKEVENTREG_FLAG(49, 0x20) #define WEEKEVENTREG_49_40 PACK_WEEKEVENTREG_FLAG(49, 0x40) #define WEEKEVENTREG_49_80 PACK_WEEKEVENTREG_FLAG(49, 0x80) -#define WEEKEVENTREG_50_01 PACK_WEEKEVENTREG_FLAG(50, 0x01) +#define WEEKEVENTREG_HELPED_GORMAN_DAY_1 PACK_WEEKEVENTREG_FLAG(50, 0x01) #define WEEKEVENTREG_50_02 PACK_WEEKEVENTREG_FLAG(50, 0x02) #define WEEKEVENTREG_50_04 PACK_WEEKEVENTREG_FLAG(50, 0x04) #define WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING PACK_WEEKEVENTREG_FLAG(50, 0x08) @@ -1120,7 +1120,7 @@ typedef enum { // Set by Kafei #define WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED PACK_WEEKEVENTREG_FLAG(51, 0x40) -#define WEEKEVENTREG_51_80 PACK_WEEKEVENTREG_FLAG(51, 0x80) +#define WEEKEVENTREG_HELPED_GORMAN_DAY_2 PACK_WEEKEVENTREG_FLAG(51, 0x80) // Protected Cremia #define WEEKEVENTREG_ESCORTED_CREMIA PACK_WEEKEVENTREG_FLAG(52, 0x01) @@ -1167,10 +1167,10 @@ typedef enum { #define WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE PACK_WEEKEVENTREG_FLAG(56, 0x02) #define WEEKEVENTREG_56_04 PACK_WEEKEVENTREG_FLAG(56, 0x04) #define WEEKEVENTREG_56_08 PACK_WEEKEVENTREG_FLAG(56, 0x08) -#define WEEKEVENTREG_56_10 PACK_WEEKEVENTREG_FLAG(56, 0x10) -#define WEEKEVENTREG_56_20 PACK_WEEKEVENTREG_FLAG(56, 0x20) -#define WEEKEVENTREG_56_40 PACK_WEEKEVENTREG_FLAG(56, 0x40) -#define WEEKEVENTREG_56_80 PACK_WEEKEVENTREG_FLAG(56, 0x80) +#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_HUMAN PACK_WEEKEVENTREG_FLAG(56, 0x10) +#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_DEKU PACK_WEEKEVENTREG_FLAG(56, 0x20) +#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_ZORA PACK_WEEKEVENTREG_FLAG(56, 0x40) +#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_GORON PACK_WEEKEVENTREG_FLAG(56, 0x80) #define WEEKEVENTREG_57_01 PACK_WEEKEVENTREG_FLAG(57, 0x01) #define WEEKEVENTREG_57_02 PACK_WEEKEVENTREG_FLAG(57, 0x02) #define WEEKEVENTREG_57_04 PACK_WEEKEVENTREG_FLAG(57, 0x04) |