From 702d43e74254f25b84f4e40963fce70911db0af2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 14 Aug 2022 17:52:12 -0400 Subject: [PATCH] Rename battle anim files --- ...mokescreen.s => battle_anim_smokescreen.s} | 0 ld_script.txt | 60 +++++++++---------- src/{bug.c => battle_anim_bug.c} | 0 src/{dark.c => battle_anim_dark.c} | 0 src/{dragon.c => battle_anim_dragon.c} | 0 src/{electric.c => battle_anim_electric.c} | 0 src/{fighting.c => battle_anim_fight.c} | 0 src/{fire.c => battle_anim_fire.c} | 0 src/{ghost.c => battle_anim_ghost.c} | 0 src/{ground.c => battle_anim_ground.c} | 0 src/{ice.c => battle_anim_ice.c} | 0 src/{normal.c => battle_anim_normal.c} | 0 src/{poison.c => battle_anim_poison.c} | 0 src/{psychic.c => battle_anim_psychic.c} | 0 src/{rock.c => battle_anim_rock.c} | 0 ...mokescreen.c => battle_anim_smokescreen.c} | 0 src/{water.c => battle_anim_water.c} | 0 sym_ewram.txt | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) rename data/{smokescreen.s => battle_anim_smokescreen.s} (100%) rename src/{bug.c => battle_anim_bug.c} (100%) rename src/{dark.c => battle_anim_dark.c} (100%) rename src/{dragon.c => battle_anim_dragon.c} (100%) rename src/{electric.c => battle_anim_electric.c} (100%) rename src/{fighting.c => battle_anim_fight.c} (100%) rename src/{fire.c => battle_anim_fire.c} (100%) rename src/{ghost.c => battle_anim_ghost.c} (100%) rename src/{ground.c => battle_anim_ground.c} (100%) rename src/{ice.c => battle_anim_ice.c} (100%) rename src/{normal.c => battle_anim_normal.c} (100%) rename src/{poison.c => battle_anim_poison.c} (100%) rename src/{psychic.c => battle_anim_psychic.c} (100%) rename src/{rock.c => battle_anim_rock.c} (100%) rename src/{smokescreen.c => battle_anim_smokescreen.c} (100%) rename src/{water.c => battle_anim_water.c} (100%) diff --git a/data/smokescreen.s b/data/battle_anim_smokescreen.s similarity index 100% rename from data/smokescreen.s rename to data/battle_anim_smokescreen.s diff --git a/ld_script.txt b/ld_script.txt index 09e230ed6..7006d3094 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -81,7 +81,7 @@ SECTIONS { src/blend_palette.o(.text); src/daycare.o(.text); src/battle_interface.o(.text); - src/smokescreen.o(.text); + src/battle_anim_smokescreen.o(.text); src/pokeball.o(.text); src/load_save.o(.text); src/trade.o(.text); @@ -162,21 +162,21 @@ SECTIONS { src/item_use.o(.text); src/battle_anim_effects_1.o(.text); src/battle_anim_effects_2.o(.text); - src/water.o(.text); - src/fire.o(.text); - src/electric.o(.text); - src/ice.o(.text); - src/fighting.o(.text); - src/poison.o(.text); + src/battle_anim_water.o(.text); + src/battle_anim_fire.o(.text); + src/battle_anim_electric.o(.text); + src/battle_anim_ice.o(.text); + src/battle_anim_fight.o(.text); + src/battle_anim_poison.o(.text); src/flying.o(.text); - src/psychic.o(.text); - src/bug.o(.text); - src/rock.o(.text); - src/ghost.o(.text); - src/dragon.o(.text); - src/dark.o(.text); - src/ground.o(.text); - src/normal.o(.text); + src/battle_anim_psychic.o(.text); + src/battle_anim_bug.o(.text); + src/battle_anim_rock.o(.text); + src/battle_anim_ghost.o(.text); + src/battle_anim_dragon.o(.text); + src/battle_anim_dark.o(.text); + src/battle_anim_ground.o(.text); + src/battle_anim_normal.o(.text); src/battle_anim_utility_funcs.o(.text); src/battle_intro.o(.text); src/bike.o(.text); @@ -409,7 +409,7 @@ SECTIONS { src/battle_util.o(.rodata); src/battle_script_commands.o(.rodata); src/battle_controller_player.o(.rodata); - data/smokescreen.o(.rodata); + data/battle_anim_smokescreen.o(.rodata); src/battle_controller_opponent.o(.rodata); src/battle_controller_link_opponent.o(.rodata); src/pokemon.o(.rodata); @@ -474,21 +474,21 @@ SECTIONS { src/item_use.o(.rodata); src/battle_anim_effects_1.o(.rodata); src/battle_anim_effects_2.o(.rodata); - src/water.o(.rodata); - src/fire.o(.rodata); - src/electric.o(.rodata); - src/ice.o(.rodata); - src/fighting.o(.rodata); - src/poison.o(.rodata); + src/battle_anim_water.o(.rodata); + src/battle_anim_fire.o(.rodata); + src/battle_anim_electric.o(.rodata); + src/battle_anim_ice.o(.rodata); + src/battle_anim_fight.o(.rodata); + src/battle_anim_poison.o(.rodata); src/flying.o(.rodata); - src/psychic.o(.rodata); - src/bug.o(.rodata); - src/rock.o(.rodata); - src/ghost.o(.rodata); - src/dragon.o(.rodata); - src/dark.o(.rodata); - src/ground.o(.rodata); - src/normal.o(.rodata); + src/battle_anim_psychic.o(.rodata); + src/battle_anim_bug.o(.rodata); + src/battle_anim_rock.o(.rodata); + src/battle_anim_ghost.o(.rodata); + src/battle_anim_dragon.o(.rodata); + src/battle_anim_dark.o(.rodata); + src/battle_anim_ground.o(.rodata); + src/battle_anim_normal.o(.rodata); src/battle_anim_utility_funcs.o(.rodata); src/battle_intro.o(.rodata); src/bike.o(.rodata); diff --git a/src/bug.c b/src/battle_anim_bug.c similarity index 100% rename from src/bug.c rename to src/battle_anim_bug.c diff --git a/src/dark.c b/src/battle_anim_dark.c similarity index 100% rename from src/dark.c rename to src/battle_anim_dark.c diff --git a/src/dragon.c b/src/battle_anim_dragon.c similarity index 100% rename from src/dragon.c rename to src/battle_anim_dragon.c diff --git a/src/electric.c b/src/battle_anim_electric.c similarity index 100% rename from src/electric.c rename to src/battle_anim_electric.c diff --git a/src/fighting.c b/src/battle_anim_fight.c similarity index 100% rename from src/fighting.c rename to src/battle_anim_fight.c diff --git a/src/fire.c b/src/battle_anim_fire.c similarity index 100% rename from src/fire.c rename to src/battle_anim_fire.c diff --git a/src/ghost.c b/src/battle_anim_ghost.c similarity index 100% rename from src/ghost.c rename to src/battle_anim_ghost.c diff --git a/src/ground.c b/src/battle_anim_ground.c similarity index 100% rename from src/ground.c rename to src/battle_anim_ground.c diff --git a/src/ice.c b/src/battle_anim_ice.c similarity index 100% rename from src/ice.c rename to src/battle_anim_ice.c diff --git a/src/normal.c b/src/battle_anim_normal.c similarity index 100% rename from src/normal.c rename to src/battle_anim_normal.c diff --git a/src/poison.c b/src/battle_anim_poison.c similarity index 100% rename from src/poison.c rename to src/battle_anim_poison.c diff --git a/src/psychic.c b/src/battle_anim_psychic.c similarity index 100% rename from src/psychic.c rename to src/battle_anim_psychic.c diff --git a/src/rock.c b/src/battle_anim_rock.c similarity index 100% rename from src/rock.c rename to src/battle_anim_rock.c diff --git a/src/smokescreen.c b/src/battle_anim_smokescreen.c similarity index 100% rename from src/smokescreen.c rename to src/battle_anim_smokescreen.c diff --git a/src/water.c b/src/battle_anim_water.c similarity index 100% rename from src/water.c rename to src/battle_anim_water.c diff --git a/sym_ewram.txt b/sym_ewram.txt index 719497748..a3766873e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -55,7 +55,7 @@ .include "src/safari_zone.o" .include "src/item_use.o" .include "src/battle_anim_effects_1.o" - .include "src/dragon.o" + .include "src/battle_anim_dragon.o" .include "src/battle_anim_utility_funcs.o" .include "src/battle_intro.o" .include "src/easy_chat.o"