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 /data/system_sbin.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 'data/system_sbin.s')
| -rw-r--r-- | data/system_sbin.s | 14 |
1 files changed, 7 insertions, 7 deletions
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 |