diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-10-23 02:03:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 16:03:16 +1100 |
| commit | 1e19cfe8697afc2d3a2cce0489da0980aaf6efd7 (patch) | |
| tree | 2973ccb22fb17d09a654b51e2140efb5893f54cc /include | |
| parent | a468be77d5e87498b343664c78b6f8488d404f19 (diff) | |
Anju objects (#1444)
* bring over the objects from the other branch
* kafeis mask
* use symbols
* dman naming after assets
* stateFlags
* remaining stuff
* anim array bug
* Name everything in DmGm after DmAn
* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED
* undef
* format
* idk
* ing
* format
* name animations from an4, thanks emil!
* emptydl
* disbelief
* review
* format
* Update assets/xml/objects/object_mask_kerfay.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64cutscene.h | 2 | ||||
| -rw-r--r-- | include/z64save.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/z64cutscene.h b/include/z64cutscene.h index af427d1a7..69cc5ce50 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -482,7 +482,7 @@ typedef enum { /* 0x22A */ CS_CMD_ACTOR_CUE_554, /* 0x22B */ CS_CMD_ACTOR_CUE_555, /* 0x22C */ CS_CMD_ACTOR_CUE_556, - /* 0x22D */ CS_CMD_ACTOR_CUE_557, + /* 0x22D */ CS_CMD_ACTOR_CUE_557, // Couple's Mask cs, Anju cues /* 0x22E */ CS_CMD_ACTOR_CUE_558, /* 0x22F */ CS_CMD_ACTOR_CUE_559, /* 0x230 */ CS_CMD_ACTOR_CUE_560, diff --git a/include/z64save.h b/include/z64save.h index 333953a76..0b6821038 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -1017,7 +1017,7 @@ typedef enum { #define WEEKEVENTREG_51_08 PACK_WEEKEVENTREG_FLAG(51, 0x08) #define WEEKEVENTREG_51_10 PACK_WEEKEVENTREG_FLAG(51, 0x10) #define WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT PACK_WEEKEVENTREG_FLAG(51, 0x20) -#define WEEKEVENTREG_51_40 PACK_WEEKEVENTREG_FLAG(51, 0x40) +#define WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED PACK_WEEKEVENTREG_FLAG(51, 0x40) #define WEEKEVENTREG_51_80 PACK_WEEKEVENTREG_FLAG(51, 0x80) // Protected Cremia |