Give battle_anim files appropriate names

This commit is contained in:
Marcus Huderle 2019-03-31 12:15:39 -05:00
parent 500d009b5c
commit 462b196abc
19 changed files with 27 additions and 19 deletions

View File

@ -564,9 +564,7 @@ struct BattleScripting
}; };
// rom_80A5C6C // rom_80A5C6C
u8 GetBattlerSide(u8 battler);
u8 GetBattlerPosition(u8 battler);
u8 GetBattlerAtPosition(u8 position);
struct BattleSpriteInfo struct BattleSpriteInfo
{ {

View File

@ -73,7 +73,7 @@ void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar
void HandleIntroSlide(u8 terrainId); void HandleIntroSlide(u8 terrainId);
int GetAnimBgAttribute(u8 bgId, u8 attributeId); int GetAnimBgAttribute(u8 bgId, u8 attributeId);
// battle_anim_80A5C6C.s // battle_anim_mons.s
void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite);
void sub_80A8AEC(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite);
void sub_80A8A6C(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite);
@ -155,6 +155,9 @@ void sub_80A6DEC(struct Sprite *sprite);
void DestroyAnimVisualTaskAndDisableBlend(u8 taskId); void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
void DestroySpriteAndFreeResources_(struct Sprite *sprite); void DestroySpriteAndFreeResources_(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
u8 GetBattlerSide(u8 battler);
u8 GetBattlerPosition(u8 battler);
u8 GetBattlerAtPosition(u8 position);
enum enum
{ {
@ -193,7 +196,7 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
void sub_80A64EC(struct Sprite *sprite); void sub_80A64EC(struct Sprite *sprite);
void sub_80A718C(struct Sprite *sprite); void sub_80A718C(struct Sprite *sprite);
// battle_anim_80A9C70.s // battle_anim_status_effects.s
#define STAT_ANIM_PLUS1 15 #define STAT_ANIM_PLUS1 15
#define STAT_ANIM_PLUS2 39 #define STAT_ANIM_PLUS2 39
#define STAT_ANIM_MINUS1 22 #define STAT_ANIM_MINUS1 22
@ -204,13 +207,11 @@ void sub_80A718C(struct Sprite *sprite);
#define STAT_ANIM_MULTIPLE_MINUS2 58 #define STAT_ANIM_MULTIPLE_MINUS2 58
void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
// battle_anim_8170478.c
void sub_8172EF0(u8 battler, struct Pokemon *mon);
// ground.c // ground.c
void sub_81152DC(u8 taskId); void sub_81152DC(u8 taskId);
// battle_anim_8170478.s // battle_anim_special.c
void sub_8172EF0(u8 battler, struct Pokemon *mon);
u8 ItemIdToBallId(u16 itemId); u8 ItemIdToBallId(u16 itemId);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId);

View File

@ -120,10 +120,10 @@ SECTIONS {
src/palette.o(.text); src/palette.o(.text);
src/sound.o(.text); src/sound.o(.text);
src/battle_anim.o(.text); src/battle_anim.o(.text);
src/battle_anim_80A5C6C.o(.text); src/battle_anim_mons.o(.text);
src/task.o(.text); src/task.o(.text);
src/reshow_battle_screen.o(.text); src/reshow_battle_screen.o(.text);
src/battle_anim_80A9C70.o(.text); src/battle_anim_status_effects.o(.text);
src/title_screen.o(.text); src/title_screen.o(.text);
src/field_weather.o(.text); src/field_weather.o(.text);
src/field_weather_effect.o(.text); src/field_weather_effect.o(.text);
@ -145,7 +145,7 @@ SECTIONS {
src/mail_data.o(.text); src/mail_data.o(.text);
src/map_name_popup.o(.text); src/map_name_popup.o(.text);
src/item_menu_icons.o(.text); src/item_menu_icons.o(.text);
src/battle_anim_80D51AC.o(.text); src/battle_anim_mon_movement.o(.text);
src/item.o(.text); src/item.o(.text);
src/contest.o(.text); src/contest.o(.text);
src/shop.o(.text); src/shop.o(.text);
@ -247,7 +247,7 @@ SECTIONS {
src/intro.o(.text); src/intro.o(.text);
src/reset_save_heap.o(.text); src/reset_save_heap.o(.text);
src/field_region_map.o(.text); src/field_region_map.o(.text);
src/battle_anim_8170478.o(.text); src/battle_anim_special.o(.text);
src/hall_of_fame.o(.text); src/hall_of_fame.o(.text);
src/credits.o(.text); src/credits.o(.text);
src/lottery_corner.o(.text); src/lottery_corner.o(.text);
@ -461,9 +461,9 @@ SECTIONS {
src/palette.o(.rodata); src/palette.o(.rodata);
src/sound.o(.rodata); src/sound.o(.rodata);
src/battle_anim.o(.rodata); src/battle_anim.o(.rodata);
src/battle_anim_80A5C6C.o(.rodata); src/battle_anim_mons.o(.rodata);
data/map_events.o(.rodata); data/map_events.o(.rodata);
src/battle_anim_80A9C70.o(.rodata); src/battle_anim_status_effects.o(.rodata);
src/title_screen.o(.rodata); src/title_screen.o(.rodata);
src/field_weather.o(.rodata); src/field_weather.o(.rodata);
src/field_weather_effect.o(.rodata); src/field_weather_effect.o(.rodata);
@ -482,7 +482,7 @@ SECTIONS {
src/fldeff_cut.o(.rodata); src/fldeff_cut.o(.rodata);
src/map_name_popup.o(.rodata); src/map_name_popup.o(.rodata);
src/item_menu_icons.o(.rodata); src/item_menu_icons.o(.rodata);
src/battle_anim_80D51AC.o(.rodata); src/battle_anim_mon_movement.o(.rodata);
src/item.o(.rodata); src/item.o(.rodata);
data/contest.o(.rodata); data/contest.o(.rodata);
src/shop.o(.rodata); src/shop.o(.rodata);
@ -566,7 +566,7 @@ SECTIONS {
src/player_pc.o(.rodata); src/player_pc.o(.rodata);
src/intro.o(.rodata); src/intro.o(.rodata);
src/field_region_map.o(.rodata); src/field_region_map.o(.rodata);
src/battle_anim_8170478.o(.rodata); src/battle_anim_special.o(.rodata);
src/hall_of_fame.o(.rodata); src/hall_of_fame.o(.rodata);
src/credits.o(.rodata); src/credits.o(.rodata);
src/lottery_corner.o(.rodata); src/lottery_corner.o(.rodata);

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_ai_script_commands.h" #include "battle_ai_script_commands.h"
#include "battle_factory.h" #include "battle_factory.h"
#include "battle_setup.h" #include "battle_setup.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "pokemon.h" #include "pokemon.h"
#include "random.h" #include "random.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_ai_script_commands.h" #include "battle_ai_script_commands.h"
#include "battle_arena.h" #include "battle_arena.h"
#include "battle_controllers.h" #include "battle_controllers.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "battle_message.h" #include "battle_message.h"
#include "battle_setup.h" #include "battle_setup.h"

View File

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "pokemon.h" #include "pokemon.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "constants/battle_script_commands.h" #include "constants/battle_script_commands.h"
#include "constants/abilities.h" #include "constants/abilities.h"
#include "constants/moves.h" #include "constants/moves.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "alloc.h" #include "alloc.h"
#include "pokemon.h" #include "pokemon.h"

View File

@ -2,6 +2,7 @@
#include "alloc.h" #include "alloc.h"
#include "apprentice.h" #include "apprentice.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "battle_message.h" #include "battle_message.h"
#include "battle_pike.h" #include "battle_pike.h"

View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h"
#include "recorded_battle.h" #include "recorded_battle.h"
#include "main.h" #include "main.h"
#include "pokemon.h" #include "pokemon.h"

View File

@ -34,7 +34,7 @@
.include "save.o" .include "save.o"
.include "battle_tower.o" .include "battle_tower.o"
.include "intro.o" .include "intro.o"
.include "battle_anim_8170478.o" .include "battle_anim_special.o"
.include "battle_factory_screen.o" .include "battle_factory_screen.o"
.include "apprentice.o" .include "apprentice.o"

View File

@ -104,7 +104,7 @@ gUnknown_02022D00: @ 2022D00
.include "src/palette.o" .include "src/palette.o"
.include "src/sound.o" .include "src/sound.o"
.include "src/battle_anim.o" .include "src/battle_anim.o"
.include "src/battle_anim_80A5C6C.o" .include "src/battle_anim_mons.o"
.space 0xC .space 0xC
.include "src/field_weather.o" .include "src/field_weather.o"