mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Reduce overlay dependencies on global.h (2) (#2442)

Browse source 
* reduce overlay dependencies on global.h

* merge cleanup

* more missed headers
This commit is contained in:
mzxrules 2025-01-27 12:17:50 -05:00 • committed by GitHub
parent bb55be60fe
commit 7dd3a83313
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 734 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
View file

@ -1,7 +1,18 @@
#include "z_en_encount2.h"
#include "overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h"
#include "libc64/qrand.h"
#include "attributes.h"
#include "gfx.h"
#include "quake.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_efc_star_field/object_efc_star_field.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
View file

@ -2,11 +2,11 @@
#define Z_EN_ENCOUNT2_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnEncount2;
typedef void (*EnEncount2ActionFunc)(struct EnEncount2*, PlayState*);
typedef void (*EnEncount2ActionFunc)(struct EnEncount2*, struct PlayState*);
#define EN_ENCOUNT2_EFFECT_COUNT 50