mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-10 01:44:36 +00:00
Reduce overlay dependencies on global.h (5) (#2466)
* remove global.h dependency from all actors * fix compiler error * fix another build issue * fix bss
This commit is contained in:
parent
1d2c912fbb
commit
494aecc9fc
437 changed files with 2743 additions and 506 deletions
|
@ -1,5 +1,6 @@
|
|||
#include "global.h"
|
||||
#include "z64debug_display.h"
|
||||
#include "z64olib.h"
|
||||
|
||||
#define DEBUG_CAM_CONTROLLER_PORT 2
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
|
|||
#endif
|
||||
|
||||
#pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
|
||||
"ique-cn:160 ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136 pal-1.0:134 pal-1.1:134"
|
||||
"ique-cn:160 ntsc-1.0:137 ntsc-1.1:137 ntsc-1.2:137 pal-1.0:135 pal-1.1:135"
|
||||
|
||||
extern u8 _buffersSegmentEnd[];
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#include "global.h"
|
||||
#include "quake.h"
|
||||
#include "terminal.h"
|
||||
#include "z64olib.h"
|
||||
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
|
||||
|
||||
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
|
||||
"ique-cn:208 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:232 pal-1.1:232"
|
||||
"ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
|
||||
|
||||
#include "global.h"
|
||||
#include "ultra64.h"
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#include "quake.h"
|
||||
#include "terminal.h"
|
||||
#include "versions.h"
|
||||
#include "z64olib.h"
|
||||
#include "overlays/actors/ovl_En_Sw/z_en_sw.h"
|
||||
|
||||
static s16 sDisableAttention = false;
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
#include "global.h"
|
||||
#include "ultra64.h"
|
||||
#include "libc64/math64.h"
|
||||
#include "segmented_address.h"
|
||||
#include "z64play.h"
|
||||
|
||||
Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
|
||||
Path* path;
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
#include "global.h"
|
||||
#include "libc64/qrand.h"
|
||||
#include "macros.h"
|
||||
#include "quake.h"
|
||||
#include "terminal.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64olib.h"
|
||||
#include "z64play.h"
|
||||
|
||||
typedef struct QuakeRequest {
|
||||
/* 0x00 */ s16 index;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue