mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 17:54:15 +00:00
Code Issues Projects Releases Wiki Activity

Move some undefs to be performed as early as possible

Browse source
This commit is contained in:
Roman971 2022-06-05 00:25:13 +02:00
parent 99547b24c1
commit 704f705c61
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/z64scene.h
View file

@ -309,13 +309,12 @@ typedef enum {
/* 0x6E */ SCENE_ID_MAX /* 0x6E */ SCENE_ID_MAX
} SceneID; } SceneID;
#undef DEFINE_SCENE
// this define exists to preserve shiftability for an unused scene that is // this define exists to preserve shiftability for an unused scene that is
// listed in the entrance table // listed in the entrance table
#define SCENE_UNUSED_6E SCENE_ID_MAX #define SCENE_UNUSED_6E SCENE_ID_MAX
#undef DEFINE_SCENE
// Entrance Index Enum // Entrance Index Enum
#define DEFINE_ENTRANCE(enum, _1, _2, _3, _4, _5, _6) enum, #define DEFINE_ENTRANCE(enum, _1, _2, _3, _4, _5, _6) enum,
@ -324,6 +323,8 @@ typedef enum {
/* 0x614 */ ENTR_MAX /* 0x614 */ ENTR_MAX
} EntranceIndex; } EntranceIndex;
#undef DEFINE_ENTRANCE
#define ENTR_LOAD_OPENING -1 #define ENTR_LOAD_OPENING -1
typedef enum { typedef enum {
@ -336,8 +337,6 @@ typedef enum {
/* 0x7FFF */ ENTR_RETURN_GROTTO // Grottos and normal Fairy Fountain /* 0x7FFF */ ENTR_RETURN_GROTTO // Grottos and normal Fairy Fountain
} ReturnEntranceIndex; } ReturnEntranceIndex;
#undef DEFINE_ENTRANCE
typedef enum { typedef enum {
/* 0 */ SDC_DEFAULT, /* 0 */ SDC_DEFAULT,
/* 1 */ SDC_SPOT00, /* 1 */ SDC_SPOT00,