summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2021-09-12 16:10:10 +0100
committerGitHub <noreply@github.com>2021-09-12 11:10:10 -0400
commiteccfd2efbf5d76f496dd0e110a2691c687e7d92d (patch)
treeb9bfe0db620add721e8f11f5d38aabd3dc21f483 /include
parente31e35658dd08e9f983eef8aef0e239ecd603333 (diff)
Decompile ovl_Door_Warp1 (#949)
* Initial progress on Door_Warp1 * Fix merge * More work on Door_Warp1 * Decompile most of Door_Warp1 * 2 more functions OK * All decompiled, 3 nonmatching * Tiny improvements, fix several warnings * Remove commented GLOBAL_ASM lines * Fix * Fix merge * Two more matches * Some docs * More docs * Use generated reloc under NON_MATCHING * Fix accesses in ru1 * Add break and add limbs and dlists for the skeleton to the object xml * Comment values for enums Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * boolean returns for flag checking functions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Named more loop variables i and named DoorWarp1_FloatPlayer * Last function matched thanks to Roman * Some further suggestions * Fix Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Diffstat (limited to 'include')
-rw-r--r--include/z64save.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/z64save.h b/include/z64save.h
index b9f596460..2469abbd9 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -187,6 +187,15 @@ typedef enum {
} ButtonStatus;
typedef enum {
+ /* 0x00 */ CHAMBER_CS_FOREST,
+ /* 0x01 */ CHAMBER_CS_FIRE,
+ /* 0x02 */ CHAMBER_CS_WATER,
+ /* 0x03 */ CHAMBER_CS_SPIRIT,
+ /* 0x04 */ CHAMBER_CS_SHADOW,
+ /* 0x05 */ CHAMBER_CS_LIGHT
+} ChamberCutsceneNum;
+
+typedef enum {
/* 0x00 */ HS_HBA, // horseback archery
/* 0x01 */ HS_POE_POINTS,
/* 0x02 */ HS_FISHING,