No need to explicitly include global.h

This commit is contained in:
PikalaxALT 2021-11-09 13:50:29 -05:00
parent b4457833fb
commit ecb09ce681
13 changed files with 4 additions and 16 deletions

View File

@ -12,9 +12,11 @@ ALL_BUILDDIRS := $(BUILD_DIR)/lib
include common.mk
include filesystem.mk
$(ASM_OBJS): MWASFLAGS += -include $(WORK_DIR)/include/config.h
$(ASM_OBJS): MWASFLAGS += -DPM_ASM -include config.h
$(C_OBJS): MWCFLAGS += -include global.h
$(ASM_SRCS): $(WORK_DIR)/include/config.h
$(ASM_OBJS): dep += $(WORK_DIR)/include/config.h $(shell $(SCANINC) -I . -I ./include -I $(WORK_DIR)/files -I $(WORK_DIR)/lib/include $(WORK_DIR)/include/config.h)
$(C_OBJS): dep += $(WORK_DIR)/include/global.h $(shell $(SCANINC) -I . -I ./include -I $(WORK_DIR)/files -I $(WORK_DIR)/lib/include $(WORK_DIR)/include/global.h)
ROM := $(BUILD_DIR)/poke$(buildname).nds
BANNER := $(ROM:%.nds=%.bnr)
@ -22,8 +24,6 @@ BANNER_SPEC := $(buildname)/banner.bsf
ICON_PNG := $(buildname)/icon.png
HEADER_TEMPLATE := $(buildname)/rom_header_template.sbin
MWASFLAGS += -DPM_ASM
.PHONY: main sub libsyscall
.PRECIOUS: $(ROM)

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "constants/items.h"
#include "save.h"
#include "bag.h"

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "bag_view.h"
#include "heap.h"
#include "save.h"

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "coins.h"
void InitCoins(u16* coins) {

View File

@ -1,6 +1,5 @@
#define _IN_FILESYSTEM_C // Place sNarcFileList here when filesystem.h is included
#include "global.h"
#include "filesystem.h"
static void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size) {

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "igt.h"
void InitIGT(struct IGT* igt) {

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "item.h"
#include "constants/items.h"
#include "constants/moves.h"

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "constants/map_sections.h"
#include "constants/maps.h"
#include "constants/sndseq.h"

View File

@ -1,4 +1,3 @@
#include "global.h"
const int gGameVersion = GAME_VERSION;
const int gGameLanguage = GAME_LANGUAGE;

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "script.h"
void InitScriptContext(struct ScriptContext* ctx, ScrCmdFunc* cmd_table, u32 cmd_count) {

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "seal_case.h"
u32 Sav2_SealCase_sizeof(void) {

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "sound.h"
#include "sound_chatot.h"
#include "options.h"

View File

@ -1,4 +1,3 @@
#include "global.h"
#include "sound.h"
int sRadioSeqNo = 0;