92301398bc
# Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c |
||
---|---|---|
.. | ||
ability_pop_up.pal | ||
ability_pop_up.png | ||
alpha_indicator.png | ||
ball_caught_indicator.png | ||
ball_display.png | ||
ball_status_bar.png | ||
burst_trigger.png | ||
dynamax_indicator.png | ||
dynamax_trigger.png | ||
enemy_mon_shadow.png | ||
expbar.png | ||
healthbox_doubles_frameend.png | ||
healthbox_doubles_frameend_bar.png | ||
healthbox_doubles_opponent.png | ||
healthbox_doubles_player.png | ||
healthbox_safari.png | ||
healthbox_singles_opponent.png | ||
healthbox_singles_player.png | ||
hpbar.png | ||
hpbar_anim.png | ||
hpbar_anim_unused.png | ||
hpbar_unused.png | ||
last_used_ball_l.png | ||
last_used_ball_l_cycle.png | ||
last_used_ball_r.png | ||
last_used_ball_r_cycle.png | ||
level_up_banner.png | ||
mega_indicator.png | ||
mega_trigger.pal | ||
mega_trigger.png | ||
misc.png | ||
misc_frameend.png | ||
misc_indicator.pal | ||
numbers1.png | ||
numbers2.png | ||
omega_indicator.png | ||
status.png | ||
status2.png | ||
status3.png | ||
status4.png | ||
text.pal | ||
text_pp.pal | ||
textbox.png | ||
textbox_0.pal | ||
textbox_1.pal | ||
textbox_map.bin | ||
unused_status_summary.png | ||
unused_window.png | ||
unused_window2.png | ||
unused_window2bar.png | ||
unused_window3.png | ||
unused_window4.png | ||
z_move_trigger.png |