diff options
Diffstat (limited to 'asm')
131 files changed, 343 insertions, 343 deletions
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s index a51ab4e85..dc3cd456f 100644 --- a/asm/battle_811DA74.s +++ b/asm/battle_811DA74.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_ai.s b/asm/battle_ai.s index 029458352..78a218688 100644 --- a/asm/battle_ai.s +++ b/asm/battle_ai.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_anim_80A7E7C.s b/asm/battle_anim_80A7E7C.s index b305c7a42..362acec8b 100644 --- a/asm/battle_anim_80A7E7C.s +++ b/asm/battle_anim_80A7E7C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index dc366a5da..d784aa4b7 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_message.s b/asm/battle_message.s index 8986ac835..8f903970f 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_records.s b/asm/battle_records.s index 10eaa45ae..4960803ca 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 3f78709b0..66a305229 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 66443242b..a4b4d1666 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 70af7824d..6b47805ca 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 00476338e..c1b2c586c 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/big_shroomish_barboach.s b/asm/big_shroomish_barboach.s index 94ad0dc98..f65615dff 100644 --- a/asm/big_shroomish_barboach.s +++ b/asm/big_shroomish_barboach.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/bike.s b/asm/bike.s index 4b324c111..d73fa55dc 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/cable_car.s b/asm/cable_car.s index 719f4f7b6..8fa960638 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s index 950a31c4a..d02c5bb2e 100644 --- a/asm/cable_car_util.s +++ b/asm/cable_car_util.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/cable_club.s b/asm/cable_club.s index b7b7bb82d..212e28a95 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index 99b6efaab..54f53f1a2 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/choose_party.s b/asm/choose_party.s index 07125dfae..762e48e61 100644 --- a/asm/choose_party.s +++ b/asm/choose_party.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/coins.s b/asm/coins.s index 5b9726fbb..9393897d6 100644 --- a/asm/coins.s +++ b/asm/coins.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest.s b/asm/contest.s index e8b413c5d..f3b176969 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_ai.s b/asm/contest_ai.s index ecd2bbb59..fdc9afbb3 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 028b56c0e..32dc389b4 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 390902a18..f57ffac1e 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 7a848f817..4e7da323d 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_painting.s b/asm/contest_painting.s index 11f1ce69d..8edea71c1 100644 --- a/asm/contest_painting.s +++ b/asm/contest_painting.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/crt0.s b/asm/crt0.s index f2c60b4e3..7a492ff17 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -1,4 +1,4 @@ - .include "constants/gba_constants.s" + .include "constants/gba_constants.inc" .syntax unified @@ -11,7 +11,7 @@ Start: @ 8000000 b Init - .include "asm/rom_header.s" + .include "asm/rom_header.inc" @ 80000C0 .word 0 diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s index 0f1b217a7..afacc19f6 100644 --- a/asm/cute_sketch.s +++ b/asm/cute_sketch.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/daycare.s b/asm/daycare.s index 072b646d1..17543a508 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/decompress.s b/asm/decompress.s index 32349001f..0f80acaab 100644 --- a/asm/decompress.s +++ b/asm/decompress.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/decoration.s b/asm/decoration.s index ba4517877..057251070 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/dewford_trend.s b/asm/dewford_trend.s index cdea62334..d2b887e2a 100644 --- a/asm/dewford_trend.s +++ b/asm/dewford_trend.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 5b80f2da5..fc4692828 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index ae27d6e31..505dc862c 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 8453e277f..d411bb080 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_camera.s b/asm/field_camera.s index 20187f062..624e1cd14 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_door.s b/asm/field_door.s index 535874fbe..56a7254ca 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_effect.s b/asm/field_effect.s index f7240cb38..6ec6d639b 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 90766a99b..68a1b02c9 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 0b7e8a983..c853d8c50 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 58533b91e..b884252be 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index fc08732b0..3d4f8a008 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/field_poison.s b/asm/field_poison.s index f51c18cfe..82209060e 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/fieldmap.s b/asm/fieldmap.s index d92bc82a2..5d914c422 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s index 1e62f5516..585718434 100644 --- a/asm/fldeff_80C5CD4.s +++ b/asm/fldeff_80C5CD4.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 3e811cd88..e595a5fc9 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/heal_location.s b/asm/heal_location.s index 6e8181b45..bc156678f 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/item.s b/asm/item.s index 7616abe97..b86eab8e6 100644 --- a/asm/item.s +++ b/asm/item.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/item_menu.s b/asm/item_menu.s index d35feb54f..04e6e04ec 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/item_use.s b/asm/item_use.s index 3b2e27b46..dcb8a68dc 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/landmark.s b/asm/landmark.s index 05f509dfe..9e74feadd 100644 --- a/asm/landmark.s +++ b/asm/landmark.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s index bdb642327..3b59592b6 100644 --- a/asm/libagbsyscall.s +++ b/asm/libagbsyscall.s @@ -1,4 +1,4 @@ - .include "asm/macros.s" + .include "asm/macros.inc" .syntax unified diff --git a/asm/libgcnmultiboot.s b/asm/libgcnmultiboot.s index 3dd4fe8ab..87003abbc 100644 --- a/asm/libgcnmultiboot.s +++ b/asm/libgcnmultiboot.s @@ -1,8 +1,8 @@ @ This library can be used to download and execute a multi-boot image from @ a GameCube using the JOY Bus protocol over the link cable. - .include "asm/macros.s" - .include "constants/constants.s" + .include "asm/macros.inc" + .include "constants/constants.inc" .equiv GCMB_STRUCT_BASE_DEST_PTR, 0x20 .equiv GCMB_STRUCT_CUR_DEST_PTR, 0x24 diff --git a/asm/load_save.s b/asm/load_save.s index 66fa16959..09a9ea969 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/m4a_1.s b/asm/m4a_1.s index 3f449c9fe..d9af09f05 100644 --- a/asm/m4a_1.s +++ b/asm/m4a_1.s @@ -1,6 +1,6 @@ - .include "asm/macros.s" - .include "constants/gba_constants.s" - .include "constants/m4a_constants.s" + .include "asm/macros.inc" + .include "constants/gba_constants.inc" + .include "constants/m4a_constants.inc" .syntax unified diff --git a/asm/m4a_3.s b/asm/m4a_3.s index 68cd8803a..a842ae925 100644 --- a/asm/m4a_3.s +++ b/asm/m4a_3.s @@ -1,6 +1,6 @@ - .include "asm/macros.s" - .include "constants/gba_constants.s" - .include "constants/m4a_constants.s" + .include "asm/macros.inc" + .include "constants/gba_constants.inc" + .include "constants/m4a_constants.inc" .syntax unified diff --git a/asm/macros.s b/asm/macros.inc index 42c35026e..6d8657892 100644 --- a/asm/macros.s +++ b/asm/macros.inc @@ -1,9 +1,9 @@ - .include "asm/macros/asm.s" - .include "asm/macros/function.s" - .include "asm/macros/movement.s" - .include "asm/macros/pokemon_data.s" - .include "asm/macros/ec.s" - .include "asm/macros/map.s" + .include "asm/macros/asm.inc" + .include "asm/macros/function.inc" + .include "asm/macros/movement.inc" + .include "asm/macros/pokemon_data.inc" + .include "asm/macros/ec.inc" + .include "asm/macros/map.inc" .macro region_map_location x, y, width, height, name .byte \x diff --git a/asm/macros/asm.s b/asm/macros/asm.inc index 4ac003fab..4ac003fab 100644 --- a/asm/macros/asm.s +++ b/asm/macros/asm.inc diff --git a/asm/macros/battle_ai_script.s b/asm/macros/battle_ai_script.inc index 38a44ddfb..38a44ddfb 100644 --- a/asm/macros/battle_ai_script.s +++ b/asm/macros/battle_ai_script.inc diff --git a/asm/macros/battle_anim.s b/asm/macros/battle_anim.inc index fc2777326..fc2777326 100644 --- a/asm/macros/battle_anim.s +++ b/asm/macros/battle_anim.inc diff --git a/asm/macros/battle_script.s b/asm/macros/battle_script.inc index 5dd1d5a1a..5dd1d5a1a 100644 --- a/asm/macros/battle_script.s +++ b/asm/macros/battle_script.inc diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.inc index 05d70e351..05d70e351 100755..100644 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.inc diff --git a/asm/macros/ec.s b/asm/macros/ec.inc index 44c974e53..44c974e53 100644 --- a/asm/macros/ec.s +++ b/asm/macros/ec.inc diff --git a/asm/macros/event.s b/asm/macros/event.inc index e3caa0c4f..e3caa0c4f 100644 --- a/asm/macros/event.s +++ b/asm/macros/event.inc diff --git a/asm/macros/field_effect_script.s b/asm/macros/field_effect_script.inc index d5895b0ef..d5895b0ef 100644 --- a/asm/macros/field_effect_script.s +++ b/asm/macros/field_effect_script.inc diff --git a/asm/macros/function.s b/asm/macros/function.inc index 67fb373a8..67fb373a8 100644 --- a/asm/macros/function.s +++ b/asm/macros/function.inc diff --git a/asm/macros/m4a.s b/asm/macros/m4a.inc index 6c5abc09b..6c5abc09b 100644 --- a/asm/macros/m4a.s +++ b/asm/macros/m4a.inc diff --git a/asm/macros/map.s b/asm/macros/map.inc index 41844b5cd..41844b5cd 100644 --- a/asm/macros/map.s +++ b/asm/macros/map.inc diff --git a/asm/macros/movement.s b/asm/macros/movement.inc index 674ce7169..674ce7169 100644 --- a/asm/macros/movement.s +++ b/asm/macros/movement.inc diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.inc index b7a9e7f8d..b7a9e7f8d 100644 --- a/asm/macros/music_voice.s +++ b/asm/macros/music_voice.inc diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.inc index b0a5f22e3..b0a5f22e3 100644 --- a/asm/macros/pokemon_data.s +++ b/asm/macros/pokemon_data.inc diff --git a/asm/mail.s b/asm/mail.s index 5a3efbf69..a08571018 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/matuda_debug_menu.s b/asm/matuda_debug_menu.s index fe76a8eb6..b6026ddf9 100644 --- a/asm/matuda_debug_menu.s +++ b/asm/matuda_debug_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index afd35a3f8..4cd52107c 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/menu_cursor.s b/asm/menu_cursor.s index 8fb1c969c..3ae01310d 100644 --- a/asm/menu_cursor.s +++ b/asm/menu_cursor.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 28f8a2959..eafb7788b 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s index 2607b8b3b..0217bf6c0 100644 --- a/asm/metatile_behavior.s +++ b/asm/metatile_behavior.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 762135a92..6d5322b91 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/money.s b/asm/money.s index c194bf238..72e5cda54 100644 --- a/asm/money.s +++ b/asm/money.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/mori_debug_menu.s b/asm/mori_debug_menu.s index 37374b9ea..b61ad2f54 100644 --- a/asm/mori_debug_menu.s +++ b/asm/mori_debug_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index ae4a03f93..1bb8d76bc 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 057517bb2..5107e301d 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e8ea18e34..121b44790 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/party_menu.s b/asm/party_menu.s index b63af2e13..232dc0019 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/player_pc.s b/asm/player_pc.s index 83b706fe3..82d804bb3 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/pokedex.s b/asm/pokedex.s index 0c9f97432..95a692106 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 7aba42bfd..ba9829dfe 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index 42c21c16c..bded77228 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/pokenav.s b/asm/pokenav.s index c324201d5..968386bd1 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/porthole.s b/asm/porthole.s index 6c880748d..5936433e6 100644 --- a/asm/porthole.s +++ b/asm/porthole.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/record_mixing.s b/asm/record_mixing.s index 2df37cb74..d8d0e26c0 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/region_map.s b/asm/region_map.s index 373b20d97..61449ba53 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom3.s b/asm/rom3.s index 736b7b6ad..257163aa2 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom5.s b/asm/rom5.s index a9d49a60e..4b0947a5d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom6.s b/asm/rom6.s index 898686d41..fcbb69f76 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s index 65b0279ed..85b369486 100644 --- a/asm/rom_800D42C.s +++ b/asm/rom_800D42C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s index 91ab01a6a..e011d3c43 100644 --- a/asm/rom_803D1FC.s +++ b/asm/rom_803D1FC.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index e5ba5758d..cf7780f78 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_804373C.s b/asm/rom_804373C.s index bae258fee..8690ed355 100644 --- a/asm/rom_804373C.s +++ b/asm/rom_804373C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index 37e33d029..7746aa5fd 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s index 117143f19..9c1a0f441 100644 --- a/asm/rom_806936C.s +++ b/asm/rom_806936C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s index 6b8ae47cb..609e0a362 100644 --- a/asm/rom_806D7F8.s +++ b/asm/rom_806D7F8.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index e3b0fe07a..27f89abde 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s index 309bd3ba9..f672bd3cb 100644 --- a/asm/rom_8080874.s +++ b/asm/rom_8080874.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s index 6685b3084..8d199442c 100644 --- a/asm/rom_80859BC.s +++ b/asm/rom_80859BC.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s index fab0f2531..6b6f9e4e5 100644 --- a/asm/rom_8094928.s +++ b/asm/rom_8094928.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index 0c8e021ab..b13240a8e 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s index 79a52f971..5c1f75667 100644 --- a/asm/rom_813BA94.s +++ b/asm/rom_813BA94.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_81473B8.s b/asm/rom_81473B8.s index 01af93d76..babd1d40d 100644 --- a/asm/rom_81473B8.s +++ b/asm/rom_81473B8.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_8148B8C.s b/asm/rom_8148B8C.s index 366ac74d7..6ed24195f 100644 --- a/asm/rom_8148B8C.s +++ b/asm/rom_8148B8C.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/rom_header.s b/asm/rom_header.inc index a7348ad1f..a7348ad1f 100644 --- a/asm/rom_header.s +++ b/asm/rom_header.inc diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index 3737d9ffc..9c7b3847b 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/roulette.s b/asm/roulette.s index b7b97558a..2551af009 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 569a42712..191c9592f 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/safari_zone.s b/asm/safari_zone.s index 75fc532e3..6785c17af 100644 --- a/asm/safari_zone.s +++ b/asm/safari_zone.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index 35e0cb359..a114bbea3 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/script_menu.s b/asm/script_menu.s index 6d6c68244..bd6180940 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s index 883adfe5d..ad598120c 100644 --- a/asm/script_pokemon_util_80C4BF0.s +++ b/asm/script_pokemon_util_80C4BF0.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/script_pokemon_util_80F99CC.s b/asm/script_pokemon_util_80F99CC.s index 24d690d1a..805fadadd 100644 --- a/asm/script_pokemon_util_80F99CC.s +++ b/asm/script_pokemon_util_80F99CC.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/secret_base.s b/asm/secret_base.s index 9a41a2dd8..474d0d531 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/shop.s b/asm/shop.s index 760586c18..a87bb308c 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/slot_machine.s b/asm/slot_machine.s index e4c4e7220..ee176211f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s index 25a524258..1e072ee64 100644 --- a/asm/sound_check_menu.s +++ b/asm/sound_check_menu.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/tileset.s b/asm/tileset.s index e64355432..d6bf2557a 100644 --- a/asm/tileset.s +++ b/asm/tileset.s @@ -1,5 +1,5 @@ - .include "constants/gba_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/title_screen.s b/asm/title_screen.s index cf3960429..1e545020e 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/trade.s b/asm/trade.s index 7896289d7..d17fef24e 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/trader.s b/asm/trader.s index 3800588e3..f7fd5ccae 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 927cb17c2..e46113132 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 98a775bb6..18585ed3a 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/truck_scene.s b/asm/truck_scene.s index 399c3010b..10dacf5bb 100644 --- a/asm/truck_scene.s +++ b/asm/truck_scene.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/unused_8124F94.s b/asm/unused_8124F94.s index 56b90ca23..335cf4453 100644 --- a/asm/unused_8124F94.s +++ b/asm/unused_8124F94.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/weather.s b/asm/weather.s index f32813762..fbcc61b6f 100644 --- a/asm/weather.s +++ b/asm/weather.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified |