mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-22 06:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_An OK and somewhat documented (#1457)

Browse Source 
* Init and Destroy

* EnAn_Update

* EnAn_Draw

* the overrides

* func_80B54124

* two more

* more funcs

* SCHEDULE_CALC_TIME_ALT

* moar

* mor

* mas

* scriiiipts

* mor funcs

* almost everythihng

* migrate data

* func_80B57B48 NON_EQUIVALENT

* object symbols

* face

* fix merge

* slots

* schedule result enum

* func_80B57B48

* format

* name some easy to name struct members

* stateFlags

* object stuff

* accessories

* text ids

* more function naming

* more naming

* name some anims

* trying to make sense out of the schedule

* convert schedule to ifs

* clean it up

* schedule algorithm

* many placeholder names

* name most of the important schedule values

* Add notes to every reamining schedule enum value

* dec

* HandleSchedule

* more naming

* name flags

* name some of the ProcessSchedule functions

* and more naming

* a bit of asset naming

* some typos

* asset naming

* more asset naming

* printing code

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_*

* name the mouths

* idk

* whoops

* format

* Name the remaining weekeventregs from anju

* name more flags

* whoops

* a

* Incorporate SCHEDULE_TIME

* format

* fix merge

* cleanup

* remove debug stuff

* clean

* WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL

* whoops

* remove some gotos

* whoops

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* whoops

* review

* ENAN_GET_8000

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* review

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* fix merge

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_An/z_en_an.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2023-11-09 19:52:32 -03:00
committed by GitHub
parent f2347000b0
commit 70637abca9
17 changed files with 3572 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64save.h
+9 -3
View File
@@ -1018,7 +1018,10 @@ 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)
// Set by Kafei
#define WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED PACK_WEEKEVENTREG_FLAG(51, 0x40)
#define WEEKEVENTREG_51_80 PACK_WEEKEVENTREG_FLAG(51, 0x80)
// Protected Cremia
@@ -1056,7 +1059,7 @@ typedef enum {
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_GORON PACK_WEEKEVENTREG_FLAG(55, 0x04)
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_ZORA PACK_WEEKEVENTREG_FLAG(55, 0x08)
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_DEKU PACK_WEEKEVENTREG_FLAG(55, 0x10)
#define WEEKEVENTREG_55_20 PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_55_40 PACK_WEEKEVENTREG_FLAG(55, 0x40)
// Gyorg has been defeated
@@ -1354,13 +1357,16 @@ typedef enum {
#define WEEKEVENTREG_86_01 PACK_WEEKEVENTREG_FLAG(86, 0x01)
#define WEEKEVENTREG_86_02 PACK_WEEKEVENTREG_FLAG(86, 0x02)
#define WEEKEVENTREG_86_04 PACK_WEEKEVENTREG_FLAG(86, 0x04)
#define WEEKEVENTREG_86_08 PACK_WEEKEVENTREG_FLAG(86, 0x08)
#define WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION PACK_WEEKEVENTREG_FLAG(86, 0x08)
#define WEEKEVENTREG_86_10 PACK_WEEKEVENTREG_FLAG(86, 0x10)
#define WEEKEVENTREG_86_20 PACK_WEEKEVENTREG_FLAG(86, 0x20)
#define WEEKEVENTREG_86_40 PACK_WEEKEVENTREG_FLAG(86, 0x40)
#define WEEKEVENTREG_86_80 PACK_WEEKEVENTREG_FLAG(86, 0x80)
#define WEEKEVENTREG_87_01 PACK_WEEKEVENTREG_FLAG(87, 0x01)
#define WEEKEVENTREG_87_02 PACK_WEEKEVENTREG_FLAG(87, 0x02)
// Set by Anju
#define WEEKEVENTREG_COUPLES_MASK_CUTSCENE_STARTED PACK_WEEKEVENTREG_FLAG(87, 0x02)
#define WEEKEVENTREG_87_04 PACK_WEEKEVENTREG_FLAG(87, 0x04)
#define WEEKEVENTREG_87_08 PACK_WEEKEVENTREG_FLAG(87, 0x08)
#define WEEKEVENTREG_87_10 PACK_WEEKEVENTREG_FLAG(87, 0x10)