diff options
| author | mid-kid <esteve.varela@gmail.com> | 2021-12-19 20:05:40 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2021-12-20 16:29:12 +0100 |
| commit | 99a038284bcbbf3a0f5ee95982f761a71a72850d (patch) | |
| tree | f2575fd7032283ac97c8a7181286ef80055919ba /asm/code_808333C.s | |
| parent | bc43a77380f2265481c7e6ca3a42d631f658a7ab (diff) | |
Translate all .include to #include
This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
assumes #include behavior). In particular, it doesn't consider paths
starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
as code was being included that had to be preprocessed by CPP (think
of #define). This contradicts standard GCC behavior.
To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc
As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.
Diffstat (limited to 'asm/code_808333C.s')
| -rw-r--r-- | asm/code_808333C.s | 6 |
1 files changed, 3 insertions, 3 deletions
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 |