From 00b44d588618c9a0feff1285183c183f1c97f1bb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 28 Jul 2019 20:33:25 -0500 Subject: [PATCH] emerald file names, part 1 --- ...attle_ai.h => battle_ai_script_commands.h} | 0 ...e_anim_813F0F4.h => battle_anim_special.h} | 0 ld_script.txt | 112 +++++++++--------- src/battle/anim/roots.c | 6 +- src/battle/battle_anim_80CA710.c | 18 --- ...attle_ai.c => battle_ai_script_commands.c} | 2 +- src/{battle => }/battle_ai_switch_items.c | 0 src/{battle => }/battle_anim.c | 0 ...anim_812C144.c => battle_anim_effects_3.c} | 0 ...m_80A7E7C.c => battle_anim_mon_movement.c} | 0 ...e_anim_813F0F4.c => battle_anim_special.c} | 2 +- ...807B69C.c => battle_anim_status_effects.c} | 0 src/{battle => }/battle_bg.c | 0 ...nt.c => battle_controller_link_opponent.c} | 2 +- ...ner.c => battle_controller_link_partner.c} | 4 +- src/{battle => }/battle_controller_opponent.c | 2 +- src/{battle => }/battle_controller_player.c | 2 +- src/{battle => }/battle_controller_safari.c | 0 src/{battle => }/battle_controller_wally.c | 2 +- .../battle_7.c => battle_gfx_sfx_util.c} | 2 +- src/{battle => }/battle_interface.c | 0 src/{battle/battle_2.c => battle_main.c} | 2 +- src/{battle => }/battle_message.c | 4 +- src/{battle => }/battle_party_menu.c | 0 src/{battle => }/battle_records.c | 0 .../battle_4.c => battle_script_commands.c} | 0 src/{battle => }/battle_setup.c | 0 src/{battle => }/battle_transition.c | 0 src/{battle => }/battle_util.c | 0 src/{battle => }/calculate_base_damage.c | 0 src/{battle => }/contest_link_80C2020.c | 0 src/{battle => }/contest_link_80C857C.c | 0 src/{battle => }/pokeball.c | 2 +- src/pokemon_summary_screen.c | 2 +- src/{battle => }/post_battle_event_funcs.c | 0 src/{battle => }/reshow_battle_screen.c | 0 src/rom3.c | 2 +- src/{battle => }/smokescreen.c | 0 sym_bss.txt | 2 +- sym_ewram.txt | 8 +- 40 files changed, 81 insertions(+), 95 deletions(-) rename include/{battle_ai.h => battle_ai_script_commands.h} (100%) rename include/{battle_anim_813F0F4.h => battle_anim_special.h} (100%) delete mode 100644 src/battle/battle_anim_80CA710.c rename src/{battle/battle_ai.c => battle_ai_script_commands.c} (99%) rename src/{battle => }/battle_ai_switch_items.c (100%) rename src/{battle => }/battle_anim.c (100%) rename src/{battle/battle_anim_812C144.c => battle_anim_effects_3.c} (100%) rename src/{battle/battle_anim_80A7E7C.c => battle_anim_mon_movement.c} (100%) rename src/{battle/battle_anim_813F0F4.c => battle_anim_special.c} (99%) rename src/{battle/battle_anim_807B69C.c => battle_anim_status_effects.c} (100%) rename src/{battle => }/battle_bg.c (100%) rename src/{battle/battle_controller_linkopponent.c => battle_controller_link_opponent.c} (99%) rename src/{battle/battle_controller_linkpartner.c => battle_controller_link_partner.c} (99%) rename src/{battle => }/battle_controller_opponent.c (99%) rename src/{battle => }/battle_controller_player.c (99%) rename src/{battle => }/battle_controller_safari.c (100%) rename src/{battle => }/battle_controller_wally.c (99%) rename src/{battle/battle_7.c => battle_gfx_sfx_util.c} (99%) rename src/{battle => }/battle_interface.c (100%) rename src/{battle/battle_2.c => battle_main.c} (99%) rename src/{battle => }/battle_message.c (99%) rename src/{battle => }/battle_party_menu.c (100%) rename src/{battle => }/battle_records.c (100%) rename src/{battle/battle_4.c => battle_script_commands.c} (100%) rename src/{battle => }/battle_setup.c (100%) rename src/{battle => }/battle_transition.c (100%) rename src/{battle => }/battle_util.c (100%) rename src/{battle => }/calculate_base_damage.c (100%) rename src/{battle => }/contest_link_80C2020.c (100%) rename src/{battle => }/contest_link_80C857C.c (100%) rename src/{battle => }/pokeball.c (99%) rename src/{battle => }/post_battle_event_funcs.c (100%) rename src/{battle => }/reshow_battle_screen.c (100%) rename src/{battle => }/smokescreen.c (100%) diff --git a/include/battle_ai.h b/include/battle_ai_script_commands.h similarity index 100% rename from include/battle_ai.h rename to include/battle_ai_script_commands.h diff --git a/include/battle_anim_813F0F4.h b/include/battle_anim_special.h similarity index 100% rename from include/battle_anim_813F0F4.h rename to include/battle_anim_special.h diff --git a/ld_script.txt b/ld_script.txt index 5a70154c0..7c74565e3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -48,17 +48,17 @@ SECTIONS { src/rom3.o(.text); src/decompress.o(.text); asm/decompress.o(.text); - src/battle/battle_bg.o(.text); - src/battle/battle_2.o(.text); - src/battle/battle_util.o(.text); - src/battle/battle_4.o(.text); - src/battle/battle_controller_player.o(.text); - src/battle/battle_7.o(.text); - src/battle/battle_controller_opponent.o(.text); - src/battle/battle_ai_switch_items.o(.text); - src/battle/battle_controller_linkopponent.o(.text); + src/battle_bg.o(.text); + src/battle_main.o(.text); + src/battle_util.o(.text); + src/battle_script_commands.o(.text); + src/battle_controller_player.o(.text); + src/battle_gfx_sfx_util.o(.text); + src/battle_controller_opponent.o(.text); + src/battle_ai_switch_items.o(.text); + src/battle_controller_link_opponent.o(.text); src/pokemon_1.o(.text); - src/battle/calculate_base_damage.o(.text); + src/calculate_base_damage.o(.text); src/pokemon_2.o(.text); src/pokemon_item_effect.o(.text); src/pokemon_3.o(.text); @@ -69,9 +69,9 @@ SECTIONS { src/blend_palette.o(.text); src/daycare.o(.text); src/egg_hatch.o(.text); - src/battle/battle_interface.o(.text); - src/battle/smokescreen.o(.text); - src/battle/pokeball.o(.text); + src/battle_interface.o(.text); + src/smokescreen.o(.text); + src/pokeball.o(.text); src/load_save.o(.text); src/trade.o(.text); src/berry_blender.o(.text); @@ -102,17 +102,17 @@ SECTIONS { src/tileset_anim.o(.text); src/palette.o(.text); src/sound.o(.text); - src/battle/battle_anim.o(.text); + src/battle_anim.o(.text); src/rom_8077ABC.o(.text); src/task.o(.text); - src/battle/reshow_battle_screen.o(.text); - src/battle/battle_anim_807B69C.o(.text); + src/reshow_battle_screen.o(.text); + src/battle_anim_status_effects.o(.text); src/title_screen.o(.text); src/field_weather.o(.text); src/field_weather_effects.o(.text); src/field_fadetransition.o(.text); src/field_screen_effect.o(.text); - src/battle/battle_setup.o(.text); + src/battle_setup.o(.text); src/cable_club.o(.text); src/debug/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); @@ -127,7 +127,7 @@ SECTIONS { src/pokedex.o(.text); src/trainer_card.o(.text); src/save_menu_util.o(.text); - src/battle/battle_party_menu.o(.text); + src/battle_party_menu.o(.text); src/unk_text_8095904.o(.text); src/pokemon_storage_system.o(.text); src/pokemon_storage_system_2.o(.text); @@ -141,7 +141,7 @@ SECTIONS { src/mail_data.o(.text); src/map_name_popup.o(.text); src/item_menu.o(.text); - src/battle/battle_anim_80A7E7C.o(.text); + src/battle_anim_mon_movement.o(.text); src/item.o(.text); src/debug/matsuda_debug_menu.o(.text); src/debug/crash.o(.text); @@ -158,7 +158,7 @@ SECTIONS { src/debug/sound_check_menu.o(.text); src/secret_base.o(.text); src/tv.o(.text); - src/battle/contest_link_80C2020.o(.text); + src/contest_link_80C2020.o(.text); src/script_pokemon_util_80C4BF0.o(.text); src/field_poison.o(.text); src/pokemon_size_record.o(.text); @@ -172,7 +172,7 @@ SECTIONS { src/field_special_scene.o(.text); src/rotating_gate.o(.text); src/safari_zone.o(.text); - src/battle/contest_link_80C857C.o(.text); + src/contest_link_80C857C.o(.text); src/item_use.o(.text); src/battle/anim/powder.o(.text); src/battle/anim/orbs.o(.text); @@ -307,19 +307,19 @@ SECTIONS { src/decoration.o(.text); src/slot_machine.o(.text); src/contest_painting.o(.text); - src/battle/battle_ai.o(.text); + src/battle_ai_script_commands.o(.text); src/trader.o(.text); src/starter_choose.o(.text); src/wallclock.o(.text); src/rom6.o(.text); src/pokeblock.o(.text); src/fldeff_flash.o(.text); - src/battle/post_battle_event_funcs.o(.text); + src/post_battle_event_funcs.o(.text); src/time_events.o(.text); src/birch_pc.o(.text); src/hof_pc.o(.text); src/field_specials.o(.text); - src/battle/battle_records.o(.text); + src/battle_records.o(.text); src/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); src/roulette.o(.text); @@ -328,9 +328,9 @@ SECTIONS { src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); - src/battle/battle_transition.o(.text); - src/battle/battle_controller_linkpartner.o(.text); - src/battle/battle_message.o(.text); + src/battle_transition.o(.text); + src/battle_controller_link_partner.o(.text); + src/battle_message.o(.text); src/choose_party.o(.text); src/cable_car.o(.text); src/roulette_util.o(.text); @@ -343,20 +343,20 @@ SECTIONS { src/contest_ai.o(.text); src/unused_81258BC.o(.text); src/battle/anim/sfx.o(.text); - src/battle/battle_controller_safari.o(.text); + src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); - src/battle/battle_anim_812C144.o(.text); + src/battle_anim_effects_3.o(.text); src/move_tutor_menu.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); src/battle_tower.o(.text); src/use_pokeblock.o(.text); - src/battle/battle_controller_wally.o(.text); + src/battle_controller_wally.o(.text); src/player_pc.o(.text); src/intro.o(.text); src/field_region_map.o(.text); - src/battle/battle_anim_813F0F4.o(.text); + src/battle_anim_special.o(.text); src/hall_of_fame.o(.text); src/credits.o(.text); src/lottery_corner.o(.text); @@ -466,19 +466,19 @@ SECTIONS { src/main_menu.o(.rodata); data/mon_attrs.o(.rodata); src/battle/battle_1.o(.rodata); - src/battle/battle_bg.o(.rodata); + src/battle_bg.o(.rodata); data/btl_attrs.o(.rodata); - src/battle/battle_4.o(.rodata); - src/battle/battle_controller_player.o(.rodata); + src/battle_script_commands.o(.rodata); + src/battle_controller_player.o(.rodata); data/smokescreen.o(.rodata); /* why is smokescreen rodata way up here and not in the correct location? */ data/battle_7.o(.rodata); - src/battle/battle_controller_opponent.o(.rodata); - src/battle/battle_controller_linkopponent.o(.rodata); + src/battle_controller_opponent.o(.rodata); + src/battle_controller_link_opponent.o(.rodata); src/data/battle_moves.o(.rodata); - src/battle/battle_util.o(.rodata); + src/battle_util.o(.rodata); src/pokemon_1.o(.rodata); src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */ - src/battle/calculate_base_damage.o(.rodata); + src/calculate_base_damage.o(.rodata); src/pokemon_2.o(.rodata); src/pokemon_item_effect.o(.rodata); src/pokemon_3.o(.rodata); @@ -487,9 +487,9 @@ SECTIONS { src/util.o(.rodata); src/daycare.o(.rodata); src/egg_hatch.o(.rodata); - src/battle/battle_7.o(.rodata); - src/battle/battle_interface.o(.rodata); - src/battle/pokeball.o(.rodata); + src/battle_gfx_sfx_util.o(.rodata); + src/battle_interface.o(.rodata); + src/pokeball.o(.rodata); src/trade.o(.rodata); src/berry_blender.o(.rodata); src/new_game.o(.rodata); @@ -515,7 +515,7 @@ SECTIONS { src/tileset_anim.o(.rodata); src/palette.o(.rodata); src/sound.o(.rodata); - src/battle/battle_anim.o(.rodata); + src/battle_anim.o(.rodata); src/rom_8077ABC.o(.rodata); data/map_events.o(.rodata); data/unused_orb.o(.rodata); /* these files are clearly the rodata for latter part of rom_8077ABC, but the linker linked map_events before these objects for some reason. perhaps it was compiling and linking 2 folders at the same time? */ @@ -525,12 +525,12 @@ SECTIONS { data/unused_hit.o(.rodata); data/unused_orb2.o(.rodata); src/task.o(.rodata); - src/battle/battle_anim_807B69C.o(.rodata); + src/battle_anim_status_effects.o(.rodata); src/title_screen.o(.rodata); src/field_weather.o(.rodata); src/field_weather_effects.o(.rodata); src/field_screen_effect.o(.rodata); - src/battle/battle_setup.o(.rodata); + src/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/debug/tomomichi_debug_menu.o(.rodata); src/debug/nohara_debug_menu.o(.rodata); @@ -543,7 +543,7 @@ SECTIONS { src/option_menu.o(.rodata); src/pokedex.o(.rodata); src/trainer_card.o(.rodata); - src/battle/battle_party_menu.o(.rodata); + src/battle_party_menu.o(.rodata); src/pokemon_storage_system.o(.rodata); src/pokemon_storage_system_2.o(.rodata); src/pokemon_storage_system_3.o(.rodata); @@ -554,7 +554,7 @@ SECTIONS { src/fldeff_cut.o(.rodata); src/debug/kagaya_debug_menu.o(.rodata); src/item_menu.o(.rodata); - src/battle/battle_anim_80A7E7C.o(.rodata); + src/battle_anim_mon_movement.o(.rodata); src/item.o(.rodata); src/debug/matsuda_debug_menu.o(.rodata); data/contest.o(.rodata); @@ -572,7 +572,7 @@ SECTIONS { src/debug/sound_check_menu.o(.rodata); src/secret_base.o(.rodata); src/tv.o(.rodata); - src/battle/contest_link_80C2020.o(.rodata); + src/contest_link_80C2020.o(.rodata); src/pokemon_size_record.o(.rodata); src/pc_screen_effect.o(.rodata); src/pc_screen_effect.o(.data); @@ -706,7 +706,7 @@ SECTIONS { src/decoration.o(.rodata); src/slot_machine.o(.rodata); src/contest_painting.o(.rodata); - src/battle/battle_ai.o(.rodata); + src/battle_ai_script_commands.o(.rodata); src/trader.o(.rodata); src/starter_choose.o(.rodata); src/wallclock.o(.rodata); @@ -714,7 +714,7 @@ SECTIONS { src/fldeff_flash.o(.rodata); src/time_events.o(.rodata); src/field_specials.o(.rodata); - src/battle/battle_records.o(.rodata); + src/battle_records.o(.rodata); src/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); src/roulette.o(.rodata); @@ -722,26 +722,26 @@ SECTIONS { src/pokedex_cry_screen.o(.rodata); src/pokedex_cry_screen.o(.data); src/landmark.o(.rodata); - src/battle/battle_transition.o(.rodata); - src/battle/battle_controller_linkpartner.o(.rodata); - src/battle/battle_message.o(.rodata); + src/battle_transition.o(.rodata); + src/battle_controller_link_partner.o(.rodata); + src/battle_message.o(.rodata); src/choose_party.o(.rodata); src/cable_car.o(.rodata); src/save.o(.rodata); src/debug/ereader_debug_menu.o(.rodata); src/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); - src/battle/battle_controller_safari.o(.rodata); - src/battle/battle_anim_812C144.o(.rodata); + src/battle_controller_safari.o(.rodata); + src/battle_anim_effects_3.o(.rodata); src/move_tutor_menu.o(.rodata); src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); src/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); - src/battle/battle_controller_wally.o(.rodata); + src/battle_controller_wally.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); - src/battle/battle_anim_813F0F4.o(.rodata); + src/battle_anim_special.o(.rodata); src/hall_of_fame.o(.rodata); src/credits.o(.rodata); src/lottery_corner.o(.rodata); diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index e2dd4a2af..e0cc441aa 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -6,7 +6,11 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern s16 gUnknown_03000728[]; + +IWRAM_DATA u32 filler_03000724; +IWRAM_DATA u16 gUnknown_03000728[4]; +IWRAM_DATA u16 gUnknown_03000730[6]; +IWRAM_DATA u32 filler_0300073c; void sub_80CB59C(struct Sprite* sprite); void sub_80CB620(struct Sprite *sprite); diff --git a/src/battle/battle_anim_80CA710.c b/src/battle/battle_anim_80CA710.c deleted file mode 100644 index 65ccd7c21..000000000 --- a/src/battle/battle_anim_80CA710.c +++ /dev/null @@ -1,18 +0,0 @@ - -// Includes -#include "global.h" - -// Static type declarations - -// Static RAM declarations - -IWRAM_DATA u32 filler_03000724; -IWRAM_DATA u16 gUnknown_03000728[4]; -IWRAM_DATA u16 gUnknown_03000730[6]; -IWRAM_DATA u32 filler_0300073c; - -// Static ROM declarations - -// .rodata - -// .text diff --git a/src/battle/battle_ai.c b/src/battle_ai_script_commands.c similarity index 99% rename from src/battle/battle_ai.c rename to src/battle_ai_script_commands.c index e192251d0..57fb479e9 100644 --- a/src/battle/battle_ai.c +++ b/src/battle_ai_script_commands.c @@ -1,5 +1,5 @@ #include "global.h" -#include "battle_ai.h" +#include "battle_ai_script_commands.h" #include "constants/abilities.h" #include "battle.h" #include "constants/battle_move_effects.h" diff --git a/src/battle/battle_ai_switch_items.c b/src/battle_ai_switch_items.c similarity index 100% rename from src/battle/battle_ai_switch_items.c rename to src/battle_ai_switch_items.c diff --git a/src/battle/battle_anim.c b/src/battle_anim.c similarity index 100% rename from src/battle/battle_anim.c rename to src/battle_anim.c diff --git a/src/battle/battle_anim_812C144.c b/src/battle_anim_effects_3.c similarity index 100% rename from src/battle/battle_anim_812C144.c rename to src/battle_anim_effects_3.c diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle_anim_mon_movement.c similarity index 100% rename from src/battle/battle_anim_80A7E7C.c rename to src/battle_anim_mon_movement.c diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle_anim_special.c similarity index 99% rename from src/battle/battle_anim_813F0F4.c rename to src/battle_anim_special.c index 9ea0585d1..7d158f671 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle_anim_special.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "blend_palette.h" #include "decompress.h" diff --git a/src/battle/battle_anim_807B69C.c b/src/battle_anim_status_effects.c similarity index 100% rename from src/battle/battle_anim_807B69C.c rename to src/battle_anim_status_effects.c diff --git a/src/battle/battle_bg.c b/src/battle_bg.c similarity index 100% rename from src/battle/battle_bg.c rename to src/battle_bg.c diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle_controller_link_opponent.c similarity index 99% rename from src/battle/battle_controller_linkopponent.c rename to src/battle_controller_link_opponent.c index 117aeb932..d514935cf 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle_controller_link_opponent.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "data2.h" #include "link.h" diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle_controller_link_partner.c similarity index 99% rename from src/battle/battle_controller_linkpartner.c rename to src/battle_controller_link_partner.c index 0db2f54b4..5dbde3e83 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle_controller_link_partner.c @@ -1,11 +1,11 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "link.h" #include "m4a.h" #include "main.h" diff --git a/src/battle/battle_controller_opponent.c b/src/battle_controller_opponent.c similarity index 99% rename from src/battle/battle_controller_opponent.c rename to src/battle_controller_opponent.c index 15e077e92..302f6a2f3 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -5,7 +5,7 @@ #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_tower.h" #include "link.h" #include "m4a.h" diff --git a/src/battle/battle_controller_player.c b/src/battle_controller_player.c similarity index 99% rename from src/battle/battle_controller_player.c rename to src/battle_controller_player.c index 5d7a8955c..9e9848a18 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2,7 +2,7 @@ #include "data2.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "battle_message.h" #include "item.h" diff --git a/src/battle/battle_controller_safari.c b/src/battle_controller_safari.c similarity index 100% rename from src/battle/battle_controller_safari.c rename to src/battle_controller_safari.c diff --git a/src/battle/battle_controller_wally.c b/src/battle_controller_wally.c similarity index 99% rename from src/battle/battle_controller_wally.c rename to src/battle_controller_wally.c index fa8b2a63b..807ec1572 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" diff --git a/src/battle/battle_7.c b/src/battle_gfx_sfx_util.c similarity index 99% rename from src/battle/battle_7.c rename to src/battle_gfx_sfx_util.c index 6e1ddceaf..80cbed64e 100644 --- a/src/battle/battle_7.c +++ b/src/battle_gfx_sfx_util.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "battle_interface.h" #include "blend_palette.h" #include "contest.h" diff --git a/src/battle/battle_interface.c b/src/battle_interface.c similarity index 100% rename from src/battle/battle_interface.c rename to src/battle_interface.c diff --git a/src/battle/battle_2.c b/src/battle_main.c similarity index 99% rename from src/battle/battle_2.c rename to src/battle_main.c index 411a1ae46..ff376a5e4 100644 --- a/src/battle/battle_2.c +++ b/src/battle_main.c @@ -8,7 +8,7 @@ #include "constants/species.h" #include "gba/flash_internal.h" #include "battle.h" -#include "battle_ai.h" +#include "battle_ai_script_commands.h" #include "battle_interface.h" #include "battle_message.h" #include "battle_setup.h" diff --git a/src/battle/battle_message.c b/src/battle_message.c similarity index 99% rename from src/battle/battle_message.c rename to src/battle_message.c index 30d127be3..6f3fa63c6 100644 --- a/src/battle/battle_message.c +++ b/src/battle_message.c @@ -20,9 +20,9 @@ #define BATTLESTRINGS_MAX BATTLESTRINGS_NO + BATTLESTRING_TO_SUB #ifdef GERMAN -#include "../data/battle_strings_de.h" // TODO: German +#include "data/battle_strings_de.h" // TODO: German #else -#include "../data/battle_strings_en.h" +#include "data/battle_strings_en.h" #endif // This is four lists of moves which use a different attack string in Japanese diff --git a/src/battle/battle_party_menu.c b/src/battle_party_menu.c similarity index 100% rename from src/battle/battle_party_menu.c rename to src/battle_party_menu.c diff --git a/src/battle/battle_records.c b/src/battle_records.c similarity index 100% rename from src/battle/battle_records.c rename to src/battle_records.c diff --git a/src/battle/battle_4.c b/src/battle_script_commands.c similarity index 100% rename from src/battle/battle_4.c rename to src/battle_script_commands.c diff --git a/src/battle/battle_setup.c b/src/battle_setup.c similarity index 100% rename from src/battle/battle_setup.c rename to src/battle_setup.c diff --git a/src/battle/battle_transition.c b/src/battle_transition.c similarity index 100% rename from src/battle/battle_transition.c rename to src/battle_transition.c diff --git a/src/battle/battle_util.c b/src/battle_util.c similarity index 100% rename from src/battle/battle_util.c rename to src/battle_util.c diff --git a/src/battle/calculate_base_damage.c b/src/calculate_base_damage.c similarity index 100% rename from src/battle/calculate_base_damage.c rename to src/calculate_base_damage.c diff --git a/src/battle/contest_link_80C2020.c b/src/contest_link_80C2020.c similarity index 100% rename from src/battle/contest_link_80C2020.c rename to src/contest_link_80C2020.c diff --git a/src/battle/contest_link_80C857C.c b/src/contest_link_80C857C.c similarity index 100% rename from src/battle/contest_link_80C857C.c rename to src/contest_link_80C857C.c diff --git a/src/battle/pokeball.c b/src/pokeball.c similarity index 99% rename from src/battle/pokeball.c rename to src/pokeball.c index abfdf2c3d..7162ee6ac 100644 --- a/src/battle/pokeball.c +++ b/src/pokeball.c @@ -1,7 +1,7 @@ #include "global.h" #include "gba/m4a_internal.h" #include "battle.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "decompress.h" #include "graphics.h" #include "m4a.h" diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 217e8ccdf..134b2b753 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1,6 +1,6 @@ #include "global.h" #include "battle.h" -#include "battle_anim_813F0F4.h" +#include "battle_anim_special.h" #include "contest.h" #include "data2.h" #include "daycare.h" diff --git a/src/battle/post_battle_event_funcs.c b/src/post_battle_event_funcs.c similarity index 100% rename from src/battle/post_battle_event_funcs.c rename to src/post_battle_event_funcs.c diff --git a/src/battle/reshow_battle_screen.c b/src/reshow_battle_screen.c similarity index 100% rename from src/battle/reshow_battle_screen.c rename to src/reshow_battle_screen.c diff --git a/src/rom3.c b/src/rom3.c index a9433695d..d332b7027 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_811DA74.h" -#include "battle_ai.h" +#include "battle_ai_script_commands.h" #include "battle_anim.h" #include "battle_anim_81258BC.h" #include "battle_anim_8137220.h" diff --git a/src/battle/smokescreen.c b/src/smokescreen.c similarity index 100% rename from src/battle/smokescreen.c rename to src/smokescreen.c diff --git a/sym_bss.txt b/sym_bss.txt index 4ee96c348..6bf1694ad 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -32,7 +32,7 @@ unk_debug_bss_3 = .; . = ALIGN(4); src/shop.o(.bss); . = ALIGN(4); src/record_mixing.o(.bss); . = ALIGN(4); src/tv.o(.bss); -. = ALIGN(4); src/battle/battle_anim_80CA710.o(.bss); +. = ALIGN(4); src/battle/anim/roots.o(.bss); . = ALIGN(4); src/easy_chat_2.o(.bss); . = ALIGN(4); src/pokenav_before.o(.bss); . = ALIGN(4); src/mauville_man.o(.bss); diff --git a/sym_ewram.txt b/sym_ewram.txt index f9596fea3..aaf2f3741 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -304,11 +304,11 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/tileset_anim.o(ewram_data); . = ALIGN(4); src/palette.o(ewram_data); . = ALIGN(4); src/sound.o(ewram_data); -. = ALIGN(4); src/battle/battle_anim.o(ewram_data); +. = ALIGN(4); src/battle_anim.o(ewram_data); . = ALIGN(4); src/rom_8077ABC.o(ewram_data); . = ALIGN(4); src/title_screen.o(ewram_data); . = ALIGN(4); src/field_weather.o(ewram_data); -. = ALIGN(4); src/battle/battle_setup.o(ewram_data); +. = ALIGN(4); src/battle_setup.o(ewram_data); . = ALIGN(4); src/cable_club.o(ewram_data); . = ALIGN(4); src/debug/taya_debug_window.o(ewram_data); . = ALIGN(4); src/wild_encounter.o(ewram_data); @@ -344,13 +344,13 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/menu_helpers.o(ewram_data); . = ALIGN(4); src/region_map.o(ewram_data); . = ALIGN(4); src/decoration.o(ewram_data); -. = ALIGN(4); src/battle/battle_ai.o(ewram_data); +. = ALIGN(4); src/battle_ai_script_commands.o(ewram_data); . = ALIGN(4); src/rom6.o(ewram_data); . = ALIGN(4); src/pokeblock.o(ewram_data); . = ALIGN(4); src/field_specials.o(ewram_data); . = ALIGN(4); src/pokedex_area_screen.o(ewram_data); . = ALIGN(4); src/roulette.o(ewram_data); -. = ALIGN(4); src/battle/battle_message.o(ewram_data); +. = ALIGN(4); src/battle_message.o(ewram_data); . = ALIGN(4); src/choose_party.o(ewram_data); . = ALIGN(4); src/cable_car.o(ewram_data); . = ALIGN(4); src/save.o(ewram_data);