diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-10-03 18:13:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 08:13:22 +1100 |
| commit | f08a69a2cbded60798101e87797cc7a691ff5749 (patch) | |
| tree | 278086a62200bd5e3ced9a257e64f7d05681c82e /include | |
| parent | f6a2f4492a5db3f3bd19601336a299d7b84cda6f (diff) | |
`ovl_Bg_Dy_Yoseizo` and related docs (#1390)
* Add ido setting to permuter
* OK
* Data imported & named, change spec
* Some easy naming
* Cleanup
* More object stuff and enums
* Document EnDyExtra
* Document DemoGetitem
* Document DemoEffect
* Some work on Elforg
* Elforg params macro, some more on Elfgrp
* Defines for number of fairies
* Tweak some flags wording
* Label beam
* Elfgrp: Name most of the stray fairy handling stuff
* cleanup
* fix typo
* GreatFairyAnimation
* name animations
* BgDyYoseizo_TrainPlayer
* Choose behaviour?
* fix merge
* format
* self review
* WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK
* jenkins
* review
* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
* review
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64save.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/z64save.h b/include/z64save.h index 1db5a566d..7d1bc781d 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -650,11 +650,14 @@ typedef enum { #define WEEKEVENTREG_CLOCK_TOWER_OPENED PACK_WEEKEVENTREG_FLAG(8, 0x40) #define WEEKEVENTREG_08_80 PACK_WEEKEVENTREG_FLAG(8, 0x80) + +// This 5 flags are managed in a special way by EnElfgrp #define WEEKEVENTREG_09_01 PACK_WEEKEVENTREG_FLAG(9, 0x01) #define WEEKEVENTREG_09_02 PACK_WEEKEVENTREG_FLAG(9, 0x02) #define WEEKEVENTREG_09_04 PACK_WEEKEVENTREG_FLAG(9, 0x04) #define WEEKEVENTREG_09_08 PACK_WEEKEVENTREG_FLAG(9, 0x08) #define WEEKEVENTREG_09_10 PACK_WEEKEVENTREG_FLAG(9, 0x10) + #define WEEKEVENTREG_09_20 PACK_WEEKEVENTREG_FLAG(9, 0x20) #define WEEKEVENTREG_09_40 PACK_WEEKEVENTREG_FLAG(9, 0x40) #define WEEKEVENTREG_09_80 PACK_WEEKEVENTREG_FLAG(9, 0x80) @@ -795,7 +798,7 @@ typedef enum { #define WEEKEVENTREG_22_40 PACK_WEEKEVENTREG_FLAG(22, 0x40) #define WEEKEVENTREG_22_80 PACK_WEEKEVENTREG_FLAG(22, 0x80) #define WEEKEVENTREG_23_01 PACK_WEEKEVENTREG_FLAG(23, 0x01) -#define WEEKEVENTREG_23_02 PACK_WEEKEVENTREG_FLAG(23, 0x02) +#define WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK PACK_WEEKEVENTREG_FLAG(23, 0x02) #define WEEKEVENTREG_23_04 PACK_WEEKEVENTREG_FLAG(23, 0x04) #define WEEKEVENTREG_23_08 PACK_WEEKEVENTREG_FLAG(23, 0x08) #define WEEKEVENTREG_23_10 PACK_WEEKEVENTREG_FLAG(23, 0x10) @@ -1631,6 +1634,9 @@ typedef enum { /* 3 */ DUNGEON_INDEX_STONE_TOWER_TEMPLE // Also applies to Inverted Stone Tower Temple } DungeonIndex; +#define STRAY_FAIRY_TOTAL 25 // total number of stray fairies, including those already in the Great Fairy Fountain +#define STRAY_FAIRY_SCATTERED_TOTAL 15 // original number of stray fairies in one dungeon area + void Sram_ActivateOwl(u8 owlId); void Sram_ClearFlagsAtDawnOfTheFirstDay(void); void Sram_SaveEndOfCycle(struct PlayState* play); |