mirror of https://github.com/zeldaret/oot.git
fix merge
This commit is contained in:
parent
3748c40b36
commit
4b12ae0445
|
@ -18,6 +18,7 @@
|
||||||
#include "save.h"
|
#include "save.h"
|
||||||
|
|
||||||
#include "assets/objects/gameplay_keep/eff_flash.h"
|
#include "assets/objects/gameplay_keep/eff_flash.h"
|
||||||
|
#include "assets/objects/gameplay_keep/gameplay_keep_0x32090.h"
|
||||||
|
|
||||||
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
|
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue