diff options
Diffstat (limited to 'data')
34 files changed, 42 insertions, 42 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 270386359..17b27fae5 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3,9 +3,9 @@ #include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" - .include "asm/macros/battle_ai_script.inc" + .include "include/macros/battle_ai_script.inc" .section script_data, "aw", %progbits diff --git a/data/battle_anim.s b/data/battle_anim.s index ed880ba77..270ba818a 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_80A7E7C.s b/data/battle_anim_80A7E7C.s index d7da20315..395b2e0ab 100644 --- a/data/battle_anim_80A7E7C.s +++ b/data/battle_anim_80A7E7C.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 4430cd372..8f62d92f6 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s index 188173252..dc0ebf9e3 100644 --- a/data/battle_anim_812C144.s +++ b/data/battle_anim_812C144.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s index de29622ad..fd24d95b6 100644 --- a/data/battle_anim_813F0F4.s +++ b/data/battle_anim_813F0F4.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index e0d11637d..2068db4ff 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,6 +1,6 @@ #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_anim.inc" + .include "include/macros.inc" + .include "include/macros/battle_anim.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/battle_interface.s b/data/battle_interface.s index 040b1b9d3..3c79b9f4b 100644 --- a/data/battle_interface.s +++ b/data/battle_interface.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_moves.s b/data/battle_moves.s index 2c65bd3a5..b56457a96 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,6 +1,6 @@ #include "constants/battle_constants.h" #include "constants/battle_move_effects.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 41edcb514..b04ebefe5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2,8 +2,8 @@ #include "constants/battle_constants.h" #include "constants/moves.h" #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_script.inc" + .include "include/macros.inc" + .include "include/macros/battle_script.inc" .include "constants/constants.inc" .include "constants/battle_script_constants.inc" diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index e113513d6..2c5c391ad 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,8 +1,8 @@ #include "constants/battle_constants.h" #include "constants/items.h" #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_script.inc" + .include "include/macros.inc" + .include "include/macros/battle_script.inc" .include "constants/constants.inc" .include "constants/battle_script_constants.inc" diff --git a/data/contest.s b/data/contest.s index 0ffcfc636..63988987d 100644 --- a/data/contest.s +++ b/data/contest.s @@ -1,6 +1,6 @@ #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_ai.s b/data/contest_ai.s index 78f926df3..af13f50f8 100644 --- a/data/contest_ai.s +++ b/data/contest_ai.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 2c709ba09..b0b74c584 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,5 +1,5 @@ - .include "asm/macros.inc" - .include "asm/macros/contest_ai_script.inc" + .include "include/macros.inc" + .include "include/macros/contest_ai_script.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/contest_effect.s b/data/contest_effect.s index 7bcb36bf1..cd960fb52 100644 --- a/data/contest_effect.s +++ b/data/contest_effect.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_link_80C2020.s b/data/contest_link_80C2020.s index 0b74e5908..f0ad06a32 100644 --- a/data/contest_link_80C2020.s +++ b/data/contest_link_80C2020.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/cute_sketch.s b/data/cute_sketch.s index b59a4b804..e3e75753d 100644 --- a/data/cute_sketch.s +++ b/data/cute_sketch.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data2a.s b/data/data2a.s index bd455ce29..c4d6343d8 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -3,7 +3,7 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data2b.s b/data/data2b.s index e82e221c1..c7cd4dfcf 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data_8393054.s b/data/data_8393054.s index 5d2f79e07..38ba47b63 100644 --- a/data/data_8393054.s +++ b/data/data_8393054.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/easy_chat.s b/data/easy_chat.s index d41ffccce..bece4a499 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -1,7 +1,7 @@ #include "constants/easy_chat.h" #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" #define EC_DUPLICATES(count) (0xFF00 + (count)) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1c8cff8d6..3b25ceab4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10,8 +10,8 @@ #include "constants/species.h" #include "constants/weather.h" #include "constants/vars.h" - .include "asm/macros.inc" - .include "asm/macros/event.inc" + .include "include/macros.inc" + .include "include/macros/event.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 900cc7009..45f8ce648 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,5 +1,5 @@ - .include "asm/macros.inc" - .include "asm/macros/field_effect_script.inc" + .include "include/macros.inc" + .include "include/macros/field_effect_script.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/map_events.s b/data/map_events.s index a06eb36d0..1531ec30e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -5,7 +5,7 @@ #include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/maps.s b/data/maps.s index 92f5544a1..727a48d0f 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,6 @@ #include "constants/maps.h" #include "constants/songs.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s index c33957945..1d6571149 100755 --- a/data/pc_screen_effect.s +++ b/data/pc_screen_effect.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 0d15169d0..410f0d4c5 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index 0908ddacb..14ea1cfb8 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index b765656f7..a3b7494dc 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokenav.s b/data/pokenav.s index f84e45596..cb0e98472 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/roulette.s b/data/roulette.s index 64b7b82e2..d19508fc3 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/sound_data.s b/data/sound_data.s index cd33950e1..fff724e68 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,7 +1,7 @@ .section .rodata - .include "asm/macros/m4a.inc" - .include "asm/macros/music_voice.inc" + .include "include/macros/m4a.inc" + .include "include/macros/music_voice.inc" .include "sound/voice_groups.inc" .include "sound/keysplit_tables.inc" diff --git a/data/strings2.s b/data/strings2.s index cece71645..f73aba76f 100644 --- a/data/strings2.s +++ b/data/strings2.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/tilesets.s b/data/tilesets.s index 443686234..d9933dbf9 100644 --- a/data/tilesets.s +++ b/data/tilesets.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata |