diff options
134 files changed, 415 insertions, 411 deletions
@@ -65,7 +65,8 @@ TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE)) ASFLAGS := -mcpu=arm7tdmi override CC1FLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm -CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef +INCLUDE_PATHS := -I include -I tools/agbcc/include +CPPFLAGS := -iquote include -I tools/agbcc/include -nostdinc -undef #### Files #### @@ -77,7 +78,6 @@ ELF := $(ROM:%.gba=%.elf) MAP := $(ROM:%.gba=%.map) C_SUBDIR = src -GFLIB_SUBDIR = gflib ASM_SUBDIR = asm DATA_SRC_SUBDIR = src/data DATA_ASM_SUBDIR = data @@ -86,7 +86,6 @@ MID_SUBDIR = sound/songs/midi SAMPLE_SUBDIR = sound/direct_sound_samples C_BUILDDIR = $(BUILD_DIR)/$(C_SUBDIR) -GFLIB_BUILDDIR = $(BUILD_DIR)/$(GFLIB_SUBDIR) ASM_BUILDDIR = $(BUILD_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(BUILD_DIR)/$(DATA_ASM_SUBDIR) SONG_BUILDDIR = $(BUILD_DIR)/$(SONG_SUBDIR) @@ -137,10 +136,8 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst # Disable dependency scanning for clean/tidy/tools # Use a separate minimal makefile for speed # Since we don't need to reload most of this makefile -ifeq (,$(filter-out all rom compare libagbsyscall syms,$(MAKECMDGOALS))) +ifeq (,$(filter-out clean,$(MAKECMDGOALS))) $(call infoshell, $(MAKE) -f make_tools.mk) -else -NODEP ?= 1 endif .PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin @@ -163,9 +160,8 @@ include graphics.mk $(TOOLDIRS): @$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX) -$(SCANINC): tools/scaninc -compare: all +compare: $(ROM) @$(SHA1SUM) $(BUILD_NAME).sha1 clean: tidy clean-tools @@ -179,29 +175,37 @@ tidy: $(RM) -r $(BUILD_DIR) @$(MAKE) clean -C libagbsyscall +define scaninc + ( paths="$$($(SCANINC) $1 $<)"; \ + echo -n "$(@:.d=.o): " > $@; \ + echo "$$paths" | xargs printf "%s " >> $@; \ + test -n "$$paths" && echo "$$paths" | xargs printf "\n%s:" >> $@; \ + echo >> $@; ) +endef + $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s @echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s -$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c $(SCANINC) - @echo -n "$(@:.d=.o): " > $@ - @$(SCANINC) -I include -I tools/agbcc/include -I gflib $< | xargs printf "%s " >> $@ +$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c + @$(call scaninc,$(INCLUDE_PATHS)) $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s dungeon_pokemon dungeon_floor data_pokemon data_item data_move - $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@ + @$(CPP) -x assembler-with-cpp $(CPPFLAGS) $< -o $(DATA_ASM_BUILDDIR)/$*.i.s + @$(PREPROC) $(DATA_ASM_BUILDDIR)/$*.i.s charmap.txt > $(DATA_ASM_BUILDDIR)/$*.s + $(AS) $(ASFLAGS) -o $@ $(DATA_ASM_BUILDDIR)/$*.s -$(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s $(SCANINC) - @echo -n "$(@:.d=.o): " > $@ - @$(SCANINC) -I include $< | xargs printf "%s " >> $@ +$(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s + @$(call scaninc,$(INCLUDE_PATHS)) $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s - $(AS) $(ASFLAGS) $< -o $@ + @$(CPP) -x assembler-with-cpp $(CPPFLAGS) $< -o $(ASM_BUILDDIR)/$*.s + $(AS) $(ASFLAGS) -o $@ $(ASM_BUILDDIR)/$*.s -$(ASM_BUILDDIR)/%.d: $(ASM_SUBDIR)/%.s $(SCANINC) - @echo -n "$(@:.d=.o): " > $@ - @$(SCANINC) $< | xargs printf "%s " >> $@ +$(ASM_BUILDDIR)/%.d: $(ASM_SUBDIR)/%.s + @$(call scaninc,$(INCLUDE_PATHS)) libagbsyscall: @$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) @@ -220,5 +224,5 @@ $(ROM): %.gba: $(ELF) $(GBAFIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent ifeq (,$(filter clean,$(MAKECMDGOALS))) -include $(ALL_OBJECTS:.o=.d) +-include $(ALL_OBJECTS:.o=.d) endif diff --git a/asm/arm_func.s b/asm/arm_func.s index a84435f..f10e342 100644 --- a/asm/arm_func.s +++ b/asm/arm_func.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_2.s b/asm/code_2.s index a9dbf43..b062aab 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8002774.s b/asm/code_8002774.s index c1e3140..14c5b6c 100644 --- a/asm/code_8002774.s +++ b/asm/code_8002774.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80035F0.s b/asm/code_80035F0.s index 19bb1c3..dd96da9 100644 --- a/asm/code_80035F0.s +++ b/asm/code_80035F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8004AA0.s b/asm/code_8004AA0.s index 44d52f6..2f1f5bf 100644 --- a/asm/code_8004AA0.s +++ b/asm/code_8004AA0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800558C.s b/asm/code_800558C.s index ad90f29..9ae474a 100644 --- a/asm/code_800558C.s +++ b/asm/code_800558C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8009804.s b/asm/code_8009804.s index 8273b0f..9498ccd 100644 --- a/asm/code_8009804.s +++ b/asm/code_8009804.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800B5F0.s b/asm/code_800B5F0.s index 2afdbed..bcad95a 100644 --- a/asm/code_800B5F0.s +++ b/asm/code_800B5F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_800D090.s b/asm/code_800D090.s index 505b5e1..dd890d8 100644 --- a/asm/code_800D090.s +++ b/asm/code_800D090.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index 0a2d752..53f3185 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s index 435b731..9b84072 100644 --- a/asm/code_801B3C0.s +++ b/asm/code_801B3C0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801C620.s b/asm/code_801C620.s index 2cbc4a8..4770bb5 100644 --- a/asm/code_801C620.s +++ b/asm/code_801C620.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801D760.s b/asm/code_801D760.s index 6f026d5..3b4d8df 100644 --- a/asm/code_801D760.s +++ b/asm/code_801D760.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801DCC4.s b/asm/code_801DCC4.s index 52212b1..9ac7c8a 100644 --- a/asm/code_801DCC4.s +++ b/asm/code_801DCC4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s index 4de5bb1..84256f9 100644 --- a/asm/code_801EE10.s +++ b/asm/code_801EE10.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803B050.s b/asm/code_803B050.s index 7e62294..c13b2b6 100644 --- a/asm/code_803B050.s +++ b/asm/code_803B050.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803C1D0.s b/asm/code_803C1D0.s index fe52d74..fb6c7cf 100644 --- a/asm/code_803C1D0.s +++ b/asm/code_803C1D0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_803D110.s b/asm/code_803D110.s index 1bf4f5d..8ee110e 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 1e11d74..5ea38ec 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8041AD0.s b/asm/code_8041AD0.s index 7d4f30a..2b216de 100644 --- a/asm/code_8041AD0.s +++ b/asm/code_8041AD0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s index 321afa0..49ef590 100644 --- a/asm/code_80428A0.s +++ b/asm/code_80428A0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s index ddd60e7..6d391de 100644 --- a/asm/code_80450F8.s +++ b/asm/code_80450F8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s index 3731a1a..529fb22 100644 --- a/asm/code_8045A00.s +++ b/asm/code_8045A00.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8048480.s b/asm/code_8048480.s index 7520dd1..37e3310 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8049590.s b/asm/code_8049590.s index 93dc942..846f24c 100644 --- a/asm/code_8049590.s +++ b/asm/code_8049590.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_804ACA0.s b/asm/code_804ACA0.s index f5172dc..7e25d6d 100644 --- a/asm/code_804ACA0.s +++ b/asm/code_804ACA0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index 5156376..8e97c19 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 8973709..8aecb64 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8057824.s b/asm/code_8057824.s index 456278c..7ea4a18 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s index 14e2d70..535fa42 100644 --- a/asm/code_806CD90.s +++ b/asm/code_806CD90.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_807001C.s b/asm/code_807001C.s index 96457c9..958db4f 100644 --- a/asm/code_807001C.s +++ b/asm/code_807001C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8070BC0.s b/asm/code_8070BC0.s index 36d911a..4435a85 100644 --- a/asm/code_8070BC0.s +++ b/asm/code_8070BC0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s index d995bdc..7a511ab 100644 --- a/asm/code_8070D04.s +++ b/asm/code_8070D04.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8071518.s b/asm/code_8071518.s index 4a5f226..f33352f 100644 --- a/asm/code_8071518.s +++ b/asm/code_8071518.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_807167C.s b/asm/code_807167C.s index acb27c6..ee32631 100644 --- a/asm/code_807167C.s +++ b/asm/code_807167C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8071858.s b/asm/code_8071858.s index d0cb318..9fc337a 100644 --- a/asm/code_8071858.s +++ b/asm/code_8071858.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s index 35f9c8b..699dad9 100644 --- a/asm/code_80718D8.s +++ b/asm/code_80718D8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8073B78.s b/asm/code_8073B78.s index 55f8418..84affaa 100644 --- a/asm/code_8073B78.s +++ b/asm/code_8073B78.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s index 841838c..2cf8274 100644 --- a/asm/code_8075BA4.s +++ b/asm/code_8075BA4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_808333C.s b/asm/code_808333C.s index 9256eec..5677a42 100644 --- a/asm/code_808333C.s +++ b/asm/code_808333C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1876,4 +1876,4 @@ sub_80840D8: _080840E4: .4byte gDungeonRngState thumb_func_end sub_80840D8 - .align 2, 0
\ No newline at end of file + .align 2, 0 diff --git a/asm/code_808411C.s b/asm/code_808411C.s index 385dd10..cf6bc94 100644 --- a/asm/code_808411C.s +++ b/asm/code_808411C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8084160.s b/asm/code_8084160.s index 54f31d7..fce2f1b 100644 --- a/asm/code_8084160.s +++ b/asm/code_8084160.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s index 189480c..3b54680 100644 --- a/asm/code_80848F0.s +++ b/asm/code_80848F0.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s index 0080472..fa3b3f5 100644 --- a/asm/code_8085B0C.s +++ b/asm/code_8085B0C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80869E4.s b/asm/code_80869E4.s index 0d39418..2083a2e 100644 --- a/asm/code_80869E4.s +++ b/asm/code_80869E4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8086A3C.s b/asm/code_8086A3C.s index d0cd7dc..0d2aead 100644 --- a/asm/code_8086A3C.s +++ b/asm/code_8086A3C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809017C.s b/asm/code_809017C.s index 3ef1c2c..fefed28 100644 --- a/asm/code_809017C.s +++ b/asm/code_809017C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8090208.s b/asm/code_8090208.s index 463cffa..81ff2ec 100644 --- a/asm/code_8090208.s +++ b/asm/code_8090208.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8094148.s b/asm/code_8094148.s index 8a2e077..d894e66 100644 --- a/asm/code_8094148.s +++ b/asm/code_8094148.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8094D28.s b/asm/code_8094D28.s index 10991a1..81210da 100644 --- a/asm/code_8094D28.s +++ b/asm/code_8094D28.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8095014.s b/asm/code_8095014.s index bd88144..228811d 100644 --- a/asm/code_8095014.s +++ b/asm/code_8095014.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80958E8.s b/asm/code_80958E8.s index b8d3c7a..b73e519 100644 --- a/asm/code_80958E8.s +++ b/asm/code_80958E8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809747C.s b/asm/code_809747C.s index 5c2e04f..05ec4f8 100644 --- a/asm/code_809747C.s +++ b/asm/code_809747C.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8097670.s b/asm/code_8097670.s index 0039819..c4d68ec 100644 --- a/asm/code_8097670.s +++ b/asm/code_8097670.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80983D8.s b/asm/code_80983D8.s index aed2fc9..31cc100 100644 --- a/asm/code_80983D8.s +++ b/asm/code_80983D8.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8098468.s b/asm/code_8098468.s index 1f46809..62154f7 100644 --- a/asm/code_8098468.s +++ b/asm/code_8098468.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index ce93c0d..32f6f5d 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_809D148.s b/asm/code_809D148.s index c3a3f96..aa255fb 100644 --- a/asm/code_809D148.s +++ b/asm/code_809D148.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s index c7d5fd0..63543ff 100644 --- a/asm/code_80A26CC.s +++ b/asm/code_80A26CC.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/code_8272724.s b/asm/code_8272724.s index b2cad11..b1dd9d4 100644 --- a/asm/code_8272724.s +++ b/asm/code_8272724.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/credits.s b/asm/credits.s index e4ae06b..b95d3dc 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1,4 +1,4 @@ - .include "constants/gba_constants.inc" + #include "asm/constants/gba_constants.inc" .syntax unified @@ -11,7 +11,7 @@ Start: @ 8000000 b Init - .include "asm/rom_header.inc" + #include "rom_header.inc" .arm .align 2, 0 diff --git a/asm/debug_menu.s b/asm/debug_menu.s index 1a1454a..794249f 100644 --- a/asm/debug_menu.s +++ b/asm/debug_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/debug_menu_1.s b/asm/debug_menu_1.s index 08a2888..82f7163 100644 --- a/asm/debug_menu_1.s +++ b/asm/debug_menu_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/debug_menu_2.s b/asm/debug_menu_2.s index 1cd5fab..19719a6 100644 --- a/asm/debug_menu_2.s +++ b/asm/debug_menu_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/event_flag.s b/asm/event_flag.s index 6777a5b..0623be2 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/exclusive_pokemon.s b/asm/exclusive_pokemon.s index 79cd1ff..71152bc 100644 --- a/asm/exclusive_pokemon.s +++ b/asm/exclusive_pokemon.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/felicity_bank.s b/asm/felicity_bank.s index 7711bc9..410f394 100644 --- a/asm/felicity_bank.s +++ b/asm/felicity_bank.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_area_1.s b/asm/friend_area_1.s index b6fe42d..0a16b66 100644 --- a/asm/friend_area_1.s +++ b/asm/friend_area_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s index 15b6f88..75d3dd2 100644 --- a/asm/friend_area_action_menu.s +++ b/asm/friend_area_action_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index 391bd3f..98a68a4 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s index ef88261..241bbf6 100644 --- a/asm/friend_rescue.s +++ b/asm/friend_rescue.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_effect.s b/asm/ground_effect.s index 8591bbc..3610df8 100644 --- a/asm/ground_effect.s +++ b/asm/ground_effect.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_event.s b/asm/ground_event.s index 871ec68..ba241ec 100644 --- a/asm/ground_event.s +++ b/asm/ground_event.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_link.s b/asm/ground_link.s index 4e8b43b..16e8578 100644 --- a/asm/ground_link.s +++ b/asm/ground_link.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_lives.s b/asm/ground_lives.s index 2c1819b..c85d536 100644 --- a/asm/ground_lives.s +++ b/asm/ground_lives.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_map.s b/asm/ground_map.s index 43ad583..204fda8 100644 --- a/asm/ground_map.s +++ b/asm/ground_map.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_object.s b/asm/ground_object.s index 6425371..71f46eb 100644 --- a/asm/ground_object.s +++ b/asm/ground_object.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_script.s b/asm/ground_script.s index 0bc3285..3a8bf35 100644 --- a/asm/ground_script.s +++ b/asm/ground_script.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/ground_sprite.s b/asm/ground_sprite.s index aa23ef4..1a0d2ac 100644 --- a/asm/ground_sprite.s +++ b/asm/ground_sprite.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/gulpin_shop.s b/asm/gulpin_shop.s index 6482a8a..a8f910d 100644 --- a/asm/gulpin_shop.s +++ b/asm/gulpin_shop.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s index f641862..9055379 100644 --- a/asm/jirachi_wish.s +++ b/asm/jirachi_wish.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage.s b/asm/kangaskhan_storage.s index 65f009a..c1cac72 100644 --- a/asm/kangaskhan_storage.s +++ b/asm/kangaskhan_storage.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s index 4652c29..9890fe4 100644 --- a/asm/kangaskhan_storage_1.s +++ b/asm/kangaskhan_storage_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s index ec64f19..98fc275 100644 --- a/asm/kangaskhan_storage_2.s +++ b/asm/kangaskhan_storage_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s index 90bf697..87f2bdd 100644 --- a/asm/kecleon_items.s +++ b/asm/kecleon_items.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/kecleon_items_1.s b/asm/kecleon_items_1.s index 1b20264..e892e48 100644 --- a/asm/kecleon_items_1.s +++ b/asm/kecleon_items_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/m4a_1.s b/asm/m4a_1.s index 8c1d78a..b6fe6f9 100644 --- a/asm/m4a_1.s +++ b/asm/m4a_1.s @@ -1,6 +1,6 @@ - .include "asm/macros.inc" - .include "constants/gba_constants.inc" - .include "constants/m4a_constants.inc" + #include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/constants/m4a_constants.inc" .syntax unified diff --git a/asm/macros.inc b/asm/macros.inc deleted file mode 100644 index d821836..0000000 --- a/asm/macros.inc +++ /dev/null @@ -1,3 +0,0 @@ - .include "asm/macros/function.inc" - .include "asm/macros/music_voice.inc" - .include "asm/macros/script.inc" diff --git a/asm/mailbox.s b/asm/mailbox.s index f164a29..d99fbde 100644 --- a/asm/mailbox.s +++ b/asm/mailbox.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/makuhita_dojo.s b/asm/makuhita_dojo.s index ef01d6d..f43f21f 100644 --- a/asm/makuhita_dojo.s +++ b/asm/makuhita_dojo.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/memory.s b/asm/memory.s index e856585..8fd07a2 100644 --- a/asm/memory.s +++ b/asm/memory.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/memory_1.s b/asm/memory_1.s index 97833ca..7896523 100644 --- a/asm/memory_1.s +++ b/asm/memory_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/moves_1.s b/asm/moves_1.s index c9f1ce8..969c450 100644 --- a/asm/moves_1.s +++ b/asm/moves_1.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/music.s b/asm/music.s index 4d617a6..c617794 100644 --- a/asm/music.s +++ b/asm/music.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/other_menus.s b/asm/other_menus.s index 676ba9a..9fe889d 100644 --- a/asm/other_menus.s +++ b/asm/other_menus.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pelipper_board.s b/asm/pelipper_board.s index 20119ed..3ab0db1 100644 --- a/asm/pelipper_board.s +++ b/asm/pelipper_board.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon.s b/asm/pokemon.s index 3682c14..105c4ed 100644 --- a/asm/pokemon.s +++ b/asm/pokemon.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index dec099a..2ffbf37 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index fc29dfb..43173ec 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/rescue_password_menu.s b/asm/rescue_password_menu.s index 44675db..99e1211 100644 --- a/asm/rescue_password_menu.s +++ b/asm/rescue_password_menu.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/sprite.s b/asm/sprite.s index 284526c..2714e7e 100644 --- a/asm/sprite.s +++ b/asm/sprite.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/unk_menu_203B360.s b/asm/unk_menu_203B360.s index 5ac6b47..d2962a7 100644 --- a/asm/unk_menu_203B360.s +++ b/asm/unk_menu_203B360.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/unk_menu_203B364.s b/asm/unk_menu_203B364.s index 40e9de2..d0a2b6e 100644 --- a/asm/unk_menu_203B364.s +++ b/asm/unk_menu_203B364.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_2.s b/asm/wonder_mail_2.s index dd6f99f..383a1c6 100644 --- a/asm/wonder_mail_2.s +++ b/asm/wonder_mail_2.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s index 2423107..043c1e7 100644 --- a/asm/wonder_mail_3.s +++ b/asm/wonder_mail_3.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_3_mid.s b/asm/wonder_mail_3_mid.s index 4aa1e3b..90c0c25 100644 --- a/asm/wonder_mail_3_mid.s +++ b/asm/wonder_mail_3_mid.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_4.s b/asm/wonder_mail_4.s index ea27a3f..8103af1 100644 --- a/asm/wonder_mail_4.s +++ b/asm/wonder_mail_4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/asm/wonder_mail_5.s b/asm/wonder_mail_5.s index cad53b3..e461b13 100644 --- a/asm/wonder_mail_5.s +++ b/asm/wonder_mail_5.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" + #include "asm/constants/gba_constants.inc" + #include "asm/macros.inc" .syntax unified diff --git a/data/cutscenes.s b/data/cutscenes.s index fecbf45..cad1fe1 100644 --- a/data/cutscenes.s +++ b/data/cutscenes.s @@ -1,8 +1,8 @@ .section .rodata - .include "asm/macros.inc" - .include "constants/script_func_constants.inc" - .include "include/constants/bg_music.h" + #include "asm/macros.inc" + #include "asm/constants/script_func_constants.inc" + #include "constants/bg_music.h" @ Debug Room .global Cutscene_DebugRoom_Main diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s index e3f197c..096fae4 100644 --- a/data/cutscenes_1.s +++ b/data/cutscenes_1.s @@ -1,8 +1,8 @@ .section .rodata - .include "asm/macros.inc" - .include "constants/script_func_constants.inc" - .include "include/constants/bg_music.h" + #include "asm/macros.inc" + #include "asm/constants/script_func_constants.inc" + #include "constants/bg_music.h" .global Unk_822C248 Unk_822C248: @@ -9156,25 +9156,25 @@ .string "pksdir0\0" .align 2,0 - .include "data/scripts/personality_test.inc" + #include "scripts/personality_test.inc" .string "pksdir0\0" .align 2,0 - .include "data/scripts/title.inc" + #include "scripts/title.inc" .string "pksdir0\0" .align 2,0 - .include "data/scripts/intro.inc" + #include "scripts/intro.inc" .string "pksdir0\0" .align 2,0 - .include "data/scripts/company_screens.inc" + #include "scripts/company_screens.inc" .string "pksdir0\0" .align 2,0 - .include "data/scripts/health_safety.inc" + #include "scripts/health_safety.inc" .string "pksdir0\0" .align 2,0 - .include "data/scripts/world_map.inc" + #include "scripts/world_map.inc" diff --git a/data/data.s b/data/data.s index c51e2d1..e00d0ce 100644 --- a/data/data.s +++ b/data/data.s @@ -99,7 +99,7 @@ gLoadScreenBackgroundPaletteFileNames: @ 80B6A28 .4byte titlen1p_text .4byte titlen2p_text - .include "data/text/save.inc" + #include "text/save.inc" .global gUnknown_80B6D90 gUnknown_80B6D90: @ 80B6D90 diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s index 25fb2b1..1b63067 100644 --- a/data/data_80D47B8.s +++ b/data/data_80D47B8.s @@ -4617,11 +4617,11 @@ gUnknown_80DCA2C: @ 80DCA2C .align 2,0 .4byte gUnknown_80DCA2C - .include "data/text/luminous_cave.inc" + #include "text/luminous_cave.inc" - .include "data/friend_area.inc" + #include "friend_area.inc" - .include "data/text/party_menu.inc" + #include "text/party_menu.inc" .global gUnknown_80DD6EC gUnknown_80DD6EC: @ 80DD6EC diff --git a/data/data_80DED44.s b/data/data_80DED44.s index 4989dea..758d88b 100644 --- a/data/data_80DED44.s +++ b/data/data_80DED44.s @@ -257,7 +257,7 @@ gUnknown_80DFE1C: @ 80DFE1C .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .include "data/text/wonder_mail_3.inc" + #include "text/wonder_mail_3.inc" .global gUnknown_80E016C gUnknown_80E016C: @ 80E016C @@ -268,7 +268,7 @@ gUnknown_80E016C: @ 80E016C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .include "data/text/wonder_mail_complete.inc" + #include "text/wonder_mail_complete.inc" .global gUnknown_80E0248 gUnknown_80E0248: @ 80E0248 diff --git a/data/data_80E2068.s b/data/data_80E2068.s index d00a658..e7e5921 100644 --- a/data/data_80E2068.s +++ b/data/data_80E2068.s @@ -1219,7 +1219,7 @@ gUnknown_80E4A40: @ 80E4A40 .byte 0x18, 0xff .byte 0x19, 0xff - .include "data/text/credits.inc" + #include "text/credits.inc" .global gUnknown_80E5990 gUnknown_80E5990: @ 80E5990 diff --git a/data/data_80F4278.s b/data/data_80F4278.s index 8a64e9e..339464f 100644 --- a/data/data_80F4278.s +++ b/data/data_80F4278.s @@ -1,5 +1,5 @@ -.include "include/constants/status.h" -.include "include/constants/targeting.h" +#include "constants/status.h" +#include "constants/targeting.h" .section .rodata .global gUnknown_80F42D0 @@ -7430,7 +7430,7 @@ gChargeMovesToStatuses: @ 81069F4 .global gMultiTurnChargingStatuses gMultiTurnChargingStatuses: @ 8106A1C - .include "include/constants/status.h" + #include "constants/status.h" .4byte CHARGING_STATUS_SOLARBEAM .4byte CHARGING_STATUS_SKY_ATTACK .4byte CHARGING_STATUS_RAZOR_WIND diff --git a/data/dungeon/floor_id.inc b/data/dungeon/floor_id.inc index accd20e..8214573 100644 --- a/data/dungeon/floor_id.inc +++ b/data/dungeon/floor_id.inc @@ -1,67 +1,67 @@ -.include "data/dungeon/TinyWoods/floor_id.inc" -.include "data/dungeon/ThunderwaveCave/floor_id.inc" -.include "data/dungeon/MtSteel/floor_id.inc" -.include "data/dungeon/SinisterWoods/floor_id.inc" -.include "data/dungeon/SilentChasm/floor_id.inc" -.include "data/dungeon/MtThunder/floor_id.inc" -.include "data/dungeon/MtThunderPeak/floor_id.inc" -.include "data/dungeon/GreatCanyon/floor_id.inc" -.include "data/dungeon/LapisCave/floor_id.inc" -.include "data/dungeon/MtBlaze/floor_id.inc" -.include "data/dungeon/MtBlazePeak/floor_id.inc" -.include "data/dungeon/FrostyForest/floor_id.inc" -.include "data/dungeon/FrostyGrotto/floor_id.inc" -.include "data/dungeon/MtFreeze/floor_id.inc" -.include "data/dungeon/MtFreezePeak/floor_id.inc" -.include "data/dungeon/MagmaCavern/floor_id.inc" -.include "data/dungeon/MagmaCavernPit/floor_id.inc" -.include "data/dungeon/SkyTower/floor_id.inc" -.include "data/dungeon/SkyTowerSummit/floor_id.inc" -.include "data/dungeon/StormySea/floor_id.inc" -.include "data/dungeon/SilverTrench/floor_id.inc" -.include "data/dungeon/MeteorCave/floor_id.inc" -.include "data/dungeon/MtFreezePeakAlt/floor_id.inc" -.include "data/dungeon/WesternCave/floor_id.inc" -.include "data/dungeon/Boss3/floor_id.inc" -.include "data/dungeon/Boss4/floor_id.inc" -.include "data/dungeon/WishCave/floor_id.inc" -.include "data/dungeon/BuriedRelic/floor_id.inc" -.include "data/dungeon/PitfallValley/floor_id.inc" -.include "data/dungeon/NorthernRange/floor_id.inc" -.include "data/dungeon/Boss9/floor_id.inc" -.include "data/dungeon/DesertRegion/floor_id.inc" -.include "data/dungeon/SouthernCavern/floor_id.inc" -.include "data/dungeon/WyvernHill/floor_id.inc" -.include "data/dungeon/FieryField/floor_id.inc" -.include "data/dungeon/NorthwindField/floor_id.inc" -.include "data/dungeon/SolarCave/floor_id.inc" -.include "data/dungeon/LightningField/floor_id.inc" -.include "data/dungeon/DarknightRelic/floor_id.inc" -.include "data/dungeon/WondrousSea/floor_id.inc" -.include "data/dungeon/MurkyCave/floor_id.inc" -.include "data/dungeon/GrandSea/floor_id.inc" -.include "data/dungeon/UproarForest/floor_id.inc" -.include "data/dungeon/OddityCave/floor_id.inc" -.include "data/dungeon/RemainsIsland/floor_id.inc" -.include "data/dungeon/MarvelousSea/floor_id.inc" -.include "data/dungeon/FantasyStrait/floor_id.inc" -.include "data/dungeon/RockPath/floor_id.inc" -.include "data/dungeon/SnowPath/floor_id.inc" -.include "data/dungeon/Autopilot/floor_id.inc" -.include "data/dungeon/D50/floor_id.inc" -.include "data/dungeon/D51/floor_id.inc" -.include "data/dungeon/DojoRegistration/floor_id.inc" -.include "data/dungeon/HowlingForest/floor_id.inc" -.include "data/dungeon/D54/floor_id.inc" -.include "data/dungeon/FantasyStraitAlt/floor_id.inc" -.include "data/dungeon/WaterfallPond/floor_id.inc" -.include "data/dungeon/UnownRelic/floor_id.inc" -.include "data/dungeon/JoyousTower/floor_id.inc" -.include "data/dungeon/FaroffSea/floor_id.inc" -.include "data/dungeon/MtFaraway/floor_id.inc" -.include "data/dungeon/D61/floor_id.inc" -.include "data/dungeon/PurityForest/floor_id.inc" -.include "data/dungeon/D63/floor_id.inc" +#include "TinyWoods/floor_id.inc" +#include "ThunderwaveCave/floor_id.inc" +#include "MtSteel/floor_id.inc" +#include "SinisterWoods/floor_id.inc" +#include "SilentChasm/floor_id.inc" +#include "MtThunder/floor_id.inc" +#include "MtThunderPeak/floor_id.inc" +#include "GreatCanyon/floor_id.inc" +#include "LapisCave/floor_id.inc" +#include "MtBlaze/floor_id.inc" +#include "MtBlazePeak/floor_id.inc" +#include "FrostyForest/floor_id.inc" +#include "FrostyGrotto/floor_id.inc" +#include "MtFreeze/floor_id.inc" +#include "MtFreezePeak/floor_id.inc" +#include "MagmaCavern/floor_id.inc" +#include "MagmaCavernPit/floor_id.inc" +#include "SkyTower/floor_id.inc" +#include "SkyTowerSummit/floor_id.inc" +#include "StormySea/floor_id.inc" +#include "SilverTrench/floor_id.inc" +#include "MeteorCave/floor_id.inc" +#include "MtFreezePeakAlt/floor_id.inc" +#include "WesternCave/floor_id.inc" +#include "Boss3/floor_id.inc" +#include "Boss4/floor_id.inc" +#include "WishCave/floor_id.inc" +#include "BuriedRelic/floor_id.inc" +#include "PitfallValley/floor_id.inc" +#include "NorthernRange/floor_id.inc" +#include "Boss9/floor_id.inc" +#include "DesertRegion/floor_id.inc" +#include "SouthernCavern/floor_id.inc" +#include "WyvernHill/floor_id.inc" +#include "FieryField/floor_id.inc" +#include "NorthwindField/floor_id.inc" +#include "SolarCave/floor_id.inc" +#include "LightningField/floor_id.inc" +#include "DarknightRelic/floor_id.inc" +#include "WondrousSea/floor_id.inc" +#include "MurkyCave/floor_id.inc" +#include "GrandSea/floor_id.inc" +#include "UproarForest/floor_id.inc" +#include "OddityCave/floor_id.inc" +#include "RemainsIsland/floor_id.inc" +#include "MarvelousSea/floor_id.inc" +#include "FantasyStrait/floor_id.inc" +#include "RockPath/floor_id.inc" +#include "SnowPath/floor_id.inc" +#include "Autopilot/floor_id.inc" +#include "D50/floor_id.inc" +#include "D51/floor_id.inc" +#include "DojoRegistration/floor_id.inc" +#include "HowlingForest/floor_id.inc" +#include "D54/floor_id.inc" +#include "FantasyStraitAlt/floor_id.inc" +#include "WaterfallPond/floor_id.inc" +#include "UnownRelic/floor_id.inc" +#include "JoyousTower/floor_id.inc" +#include "FaroffSea/floor_id.inc" +#include "MtFaraway/floor_id.inc" +#include "D61/floor_id.inc" +#include "PurityForest/floor_id.inc" +#include "D63/floor_id.inc" @ Start of Dungeon Floor ID Table .global DungeonPointerTable diff --git a/data/dungeon/main_data.inc b/data/dungeon/main_data.inc index de8e282..6ea5946 100644 --- a/data/dungeon/main_data.inc +++ b/data/dungeon/main_data.inc @@ -2,29 +2,29 @@ .global DungeonMainData DungeonMainData: -.include "data/dungeon/TinyWoods/main_data.inc" -.include "data/dungeon/ThunderwaveCave/main_data.inc" -.include "data/dungeon/MtSteel/main_data.inc" -.include "data/dungeon/SinisterWoods/main_data.inc" -.include "data/dungeon/SilentChasm/main_data.inc" -.include "data/dungeon/MtThunder/main_data.inc" -.include "data/dungeon/MtThunderPeak/main_data.inc" -.include "data/dungeon/GreatCanyon/main_data.inc" -.include "data/dungeon/LapisCave/main_data.inc" -.include "data/dungeon/MtBlaze/main_data.inc" -.include "data/dungeon/MtBlazePeak/main_data.inc" -.include "data/dungeon/FrostyForest/main_data.inc" -.include "data/dungeon/FrostyGrotto/main_data.inc" -.include "data/dungeon/MtFreeze/main_data.inc" -.include "data/dungeon/MtFreezePeak/main_data.inc" -.include "data/dungeon/MagmaCavern/main_data.inc" -.include "data/dungeon/MagmaCavernPit/main_data.inc" -.include "data/dungeon/SkyTower/main_data.inc" -.include "data/dungeon/SkyTowerSummit/main_data.inc" -.include "data/dungeon/StormySea/main_data.inc" -.include "data/dungeon/SilverTrench/main_data.inc" -.include "data/dungeon/MeteorCave/main_data.inc" -.include "data/dungeon/MtFreezePeakAlt/main_data.inc" +#include "TinyWoods/main_data.inc" +#include "ThunderwaveCave/main_data.inc" +#include "MtSteel/main_data.inc" +#include "SinisterWoods/main_data.inc" +#include "SilentChasm/main_data.inc" +#include "MtThunder/main_data.inc" +#include "MtThunderPeak/main_data.inc" +#include "GreatCanyon/main_data.inc" +#include "LapisCave/main_data.inc" +#include "MtBlaze/main_data.inc" +#include "MtBlazePeak/main_data.inc" +#include "FrostyForest/main_data.inc" +#include "FrostyGrotto/main_data.inc" +#include "MtFreeze/main_data.inc" +#include "MtFreezePeak/main_data.inc" +#include "MagmaCavern/main_data.inc" +#include "MagmaCavernPit/main_data.inc" +#include "SkyTower/main_data.inc" +#include "SkyTowerSummit/main_data.inc" +#include "StormySea/main_data.inc" +#include "SilverTrench/main_data.inc" +#include "MeteorCave/main_data.inc" +#include "MtFreezePeakAlt/main_data.inc" diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc index 67ca464..c32676b 100644 --- a/data/dungeon/pokemon_found.inc +++ b/data/dungeon/pokemon_found.inc @@ -1,26 +1,26 @@ @ Start of Pokemon Found (0x84b6064) -.include "include/constants/species.h" +#include "constants/species.h" -.include "data/dungeon/TinyWoods/pokemon_found.inc" -.include "data/dungeon/ThunderwaveCave/pokemon_found.inc" -.include "data/dungeon/MtSteel/pokemon_found.inc" -.include "data/dungeon/SinisterWoods/pokemon_found.inc" -.include "data/dungeon/SilentChasm/pokemon_found.inc" -.include "data/dungeon/MtThunder/pokemon_found.inc" -.include "data/dungeon/MtThunderPeak/pokemon_found.inc" -.include "data/dungeon/GreatCanyon/pokemon_found.inc" -.include "data/dungeon/LapisCave/pokemon_found.inc" -.include "data/dungeon/MtBlaze/pokemon_found.inc" -.include "data/dungeon/MtBlazePeak/pokemon_found.inc" -.include "data/dungeon/FrostyForest/pokemon_found.inc" -.include "data/dungeon/FrostyGrotto/pokemon_found.inc" -.include "data/dungeon/MtFreeze/pokemon_found.inc" -.include "data/dungeon/MtFreezePeak/pokemon_found.inc" -.include "data/dungeon/MagmaCavern/pokemon_found.inc" -.include "data/dungeon/MagmaCavernPit/pokemon_found.inc" -.include "data/dungeon/SkyTower/pokemon_found.inc" -.include "data/dungeon/SkyTowerSummit/pokemon_found.inc" +#include "TinyWoods/pokemon_found.inc" +#include "ThunderwaveCave/pokemon_found.inc" +#include "MtSteel/pokemon_found.inc" +#include "SinisterWoods/pokemon_found.inc" +#include "SilentChasm/pokemon_found.inc" +#include "MtThunder/pokemon_found.inc" +#include "MtThunderPeak/pokemon_found.inc" +#include "GreatCanyon/pokemon_found.inc" +#include "LapisCave/pokemon_found.inc" +#include "MtBlaze/pokemon_found.inc" +#include "MtBlazePeak/pokemon_found.inc" +#include "FrostyForest/pokemon_found.inc" +#include "FrostyGrotto/pokemon_found.inc" +#include "MtFreeze/pokemon_found.inc" +#include "MtFreezePeak/pokemon_found.inc" +#include "MagmaCavern/pokemon_found.inc" +#include "MagmaCavernPit/pokemon_found.inc" +#include "SkyTower/pokemon_found.inc" +#include "SkyTowerSummit/pokemon_found.inc" .byte 0x48, 0x32, 0x1a, 0x07, 0x1a, 0x07, 0x00, 0x00 diff --git a/data/dungeon_sbin.s b/data/dungeon_sbin.s index d24b3b7..95f455e 100644 --- a/data/dungeon_sbin.s +++ b/data/dungeon_sbin.s @@ -30725,16 +30725,16 @@ b00pal: .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80 -.include "data/dungeon/banfont.inc" -.include "data/dungeon/banrpal.inc" -.include "data/dungeon/colvec.inc" -.include "data/dungeon/etcfont.inc" -.include "data/dungeon/etcfonta.inc" -.include "data/dungeon/fixedmap.inc" -.include "data/dungeon/hp5font.inc" -.include "data/dungeon/itempat.inc" -.include "data/dungeon/jyochu.inc" -.include "data/dungeon/levfont.inc" +#include "dungeon/banfont.inc" +#include "dungeon/banrpal.inc" +#include "dungeon/colvec.inc" +#include "dungeon/etcfont.inc" +#include "dungeon/etcfonta.inc" +#include "dungeon/fixedmap.inc" +#include "dungeon/hp5font.inc" +#include "dungeon/itempat.inc" +#include "dungeon/jyochu.inc" +#include "dungeon/levfont.inc" @ Dungoeon Floor SIRO HEADER .global Mapparam_SIRO @@ -30744,11 +30744,11 @@ Mapparam_SIRO: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 -.include "data/dungeon/floor_id.inc" -.include "data/dungeon/main_data.inc" -.include "data/dungeon/pokemon_found.inc" -.include "data/dungeon/traps_found.inc" -.include "data/dungeon/items_found.inc" +#include "dungeon/floor_id.inc" +#include "dungeon/main_data.inc" +#include "dungeon/pokemon_found.inc" +#include "dungeon/traps_found.inc" +#include "dungeon/items_found.inc" .global DungeonMasterTable DungeonMasterTable: @@ -36413,5 +36413,5 @@ PartnerConversion9SIRO: .byte 0x30, 0x5f, 0x30, 0x32, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x5f, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f .byte 0x6e, 0x5f, 0x30, 0x39, 0x30, 0x5f, 0x30, 0x31, 0x00, 0x00, 0x00, 0x00 -.include "data/dungeon/trappat.inc" -.include "data/dungeon/zmappat.inc" +#include "dungeon/trappat.inc" +#include "dungeon/zmappat.inc" diff --git a/data/sound_data.s b/data/sound_data.s index d21dfbb..32367fd 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,8 +1,8 @@ .section .rodata - .include "include/macros/m4a.inc" + #include "asm/macros/m4a.inc" - .include "sound/music_player_table.inc" - .include "sound/song_table.inc" + #include "../sound/music_player_table.inc" + #include "../sound/song_table.inc" .incbin "baserom.gba", 0x1E8841C, 0x177BE4 diff --git a/data/system_sbin.s b/data/system_sbin.s index 6742b67..7ea8cd5 100644 --- a/data/system_sbin.s +++ b/data/system_sbin.s @@ -1583,14 +1583,14 @@ DataRootTable: .byte 0x28, 0xcc, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @ Address 0x306580 -.include "data/item/item_descriptions.s" +#include "item/item_descriptions.s" .align 2,0 @ Address 0x30cc28 -.include "data/item/item_data.inc" +#include "item/item_data.inc" @ Address 0x30ea28 -.include "data/item/item_names.s" +#include "item/item_names.s" .string "SIRO" .byte 0xb0, 0x91, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -10923,10 +10923,10 @@ DataRootTable: .byte 0x00, 0x00, 0x00, 0x00 @ Address 0x357b98 -.include "data/pokemon/species_data.inc" +#include "pokemon/species_data.inc" @ Address 0x35f2d8 -.include "data/pokemon/species_names.s" +#include "pokemon/species_names.s" .string "SIRO" .byte 0x38, 0x33, 0x37, 0x08, 0x00, 0x00, 0x00, 0x00 @@ -11809,10 +11809,10 @@ DataRootTable: .byte 0x0f, 0x83, 0x10, 0x83, 0x11, 0x83, 0x12, 0x83, 0x13, 0x83, 0x14, 0x83, 0x15, 0x83, 0x16, 0x83, 0x17, 0x83, 0x18, 0x83, 0x19, 0x83, 0x1a, 0x83, 0x1b, 0x83, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00 @ Address 0x3679a0 -.include "data/move/move_data.inc" +#include "move/move_data.inc" @ Address 0x36b3b4 -.include "data/move/move_names.s" +#include "move/move_names.s" .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x0c, 0x36, 0x08, 0x26, 0x0c, 0x36, 0x08, 0x4a, 0x0c, 0x36, 0x08, 0x70, 0x0c, 0x36, 0x08, 0x94, 0x0c, 0x36, 0x08, 0xc0, 0x0c, 0x36, 0x08, 0xe9, 0x0c, 0x36, 0x08, 0x06, 0x0d, 0x36, 0x08 diff --git a/constants/gba_constants.inc b/include/asm/constants/gba_constants.inc index 9d59c8f..9d59c8f 100644 --- a/constants/gba_constants.inc +++ b/include/asm/constants/gba_constants.inc diff --git a/constants/m4a_constants.inc b/include/asm/constants/m4a_constants.inc index 62ca5bb..62ca5bb 100644 --- a/constants/m4a_constants.inc +++ b/include/asm/constants/m4a_constants.inc diff --git a/constants/script_func_constants.inc b/include/asm/constants/script_func_constants.inc index 157153d..157153d 100644 --- a/constants/script_func_constants.inc +++ b/include/asm/constants/script_func_constants.inc diff --git a/include/asm/macros.inc b/include/asm/macros.inc new file mode 100644 index 0000000..21adecd --- /dev/null +++ b/include/asm/macros.inc @@ -0,0 +1,3 @@ + #include "macros/function.inc" + #include "macros/music_voice.inc" + #include "macros/script.inc" diff --git a/asm/macros/function.inc b/include/asm/macros/function.inc index 67fb373..67fb373 100644 --- a/asm/macros/function.inc +++ b/include/asm/macros/function.inc diff --git a/include/macros/m4a.inc b/include/asm/macros/m4a.inc index 6c5abc0..6c5abc0 100644 --- a/include/macros/m4a.inc +++ b/include/asm/macros/m4a.inc diff --git a/asm/macros/music_voice.inc b/include/asm/macros/music_voice.inc index 7dd6c74..7dd6c74 100644 --- a/asm/macros/music_voice.inc +++ b/include/asm/macros/music_voice.inc diff --git a/asm/macros/script.inc b/include/asm/macros/script.inc index 8ef4bd8..8ef4bd8 100644 --- a/asm/macros/script.inc +++ b/include/asm/macros/script.inc diff --git a/libagbsyscall/libagbsyscall.s b/libagbsyscall/libagbsyscall.s index 0c90da9..e4968b2 100644 --- a/libagbsyscall/libagbsyscall.s +++ b/libagbsyscall/libagbsyscall.s @@ -1,5 +1,5 @@ - .include "../constants/gba_constants.inc" - .include "../asm/macros/function.inc" + .include "../include/asm/constants/gba_constants.inc" + .include "../include/asm/macros/function.inc" .syntax unified diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp index 48ef147..50ef81a 100644 --- a/tools/dungeonjson/dungeonjson.cpp +++ b/tools/dungeonjson/dungeonjson.cpp @@ -387,13 +387,13 @@ string generate_species_data_text(Json data) { ostringstream text; text << "@ This is auto-generated by species_data.json.\n"; - text << ".include \"include/constants/ability.h\"\n"; - text << ".include \"include/constants/evolve_type.h\"\n"; - text << ".include \"include/constants/friend_area.h\"\n"; - text << ".include \"include/constants/item.h\"\n"; - text << ".include \"include/constants/species.h\"\n"; - text << ".include \"include/constants/type.h\"\n"; - text << ".include \"include/constants/walkable_tile.h\"\n"; + text << "#include \"constants/ability.h\"\n"; + text << "#include \"constants/evolve_type.h\"\n"; + text << "#include \"constants/friend_area.h\"\n"; + text << "#include \"constants/item.h\"\n"; + text << "#include \"constants/species.h\"\n"; + text << "#include \"constants/type.h\"\n"; + text << "#include \"constants/walkable_tile.h\"\n"; text << ".global gSpeciesData\n"; text << "gSpeciesData:"; for (Json data_entry : data.array_items()) { @@ -447,8 +447,8 @@ string generate_item_data_text(Json data) { ostringstream text; text << "@ This is auto-generated by item_data.json.\n"; - text << ".include \"include/constants/item.h\"\n"; - text << ".include \"include/constants/move_id.h\"\n"; + text << "#include \"constants/item.h\"\n"; + text << "#include \"constants/move_id.h\"\n"; text << ".global gItemData\n"; text << "gItemData:"; for (Json data_entry : data.array_items()) { @@ -476,7 +476,7 @@ string generate_move_data_text(Json data) { ostringstream text; text << "@ This is auto-generated by move_data.json.\n"; - text << ".include \"include/constants/type.h\"\n"; + text << "#include \"constants/type.h\"\n"; text << ".global gMoveData\n"; text << "gMoveData:"; for (Json data_entry : data.array_items()) { |