Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # 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		2023-10-09 16:51:41 -03:00
..
ability_pop_up.pal
ability_pop_up.png	Ability popup fixes	2023-01-21 18:12:12 +01:00
alpha_indicator.png	alpha omega indicator sprites use the same palete	2023-03-06 15:22:28 +01:00
ball_caught_indicator.png	Combine/colorize status graphics	2023-01-13 12:53:08 -05:00
ball_display.png
ball_status_bar.png
burst_trigger.png	Sprites and fixes	2023-08-11 13:36:01 -05:00
dynamax_indicator.png	implemented Gigantamax form change	2023-03-11 10:48:21 -08:00
dynamax_trigger.png	added Dynamax trigger sprite	2023-03-10 22:05:23 -08:00
enemy_mon_shadow.png
expbar.png
healthbox_doubles_frameend_bar.png
healthbox_doubles_frameend.png
healthbox_doubles_opponent.png
healthbox_doubles_player.png
healthbox_safari.png
healthbox_singles_opponent.png
healthbox_singles_player.png
hpbar_anim_unused.png
hpbar_anim.png
hpbar_unused.png
hpbar.png
last_used_ball_l_cycle.png	Allow Cycling Through Balls in the Last Ball Used Menu (#3039)	2023-08-24 19:23:26 -04:00
last_used_ball_l.png
last_used_ball_r_cycle.png	Allow Cycling Through Balls in the Last Ball Used Menu (#3039)	2023-08-24 19:23:26 -04:00
last_used_ball_r.png
level_up_banner.png
mega_indicator.png
mega_trigger.pal
mega_trigger.png
misc_frameend.png
misc_indicator.pal	dynamax indicator shares palette with alpha/omega	2023-03-11 10:47:23 -08:00
misc.png
numbers1.png
numbers2.png
omega_indicator.png	alpha omega indicator sprites use the same palete	2023-03-06 15:22:28 +01:00
status.png	Add Frostbite status	2023-04-22 18:23:08 +02:00
status2.png	Fix status icons	2023-04-26 23:33:22 +02:00
status3.png	Fix status icons	2023-04-26 23:33:22 +02:00
status4.png	Fix status icons	2023-04-26 23:33:22 +02:00
text_pp.pal
text.pal
textbox_1.pal
textbox_0.pal
textbox_map.bin
textbox.png
unused_status_summary.png
unused_window.png
unused_window2.png
unused_window2bar.png
unused_window3.png
unused_window4.png
z_move_trigger.png	Purged the bKGD warning once and for all	2023-02-24 02:01:55 -03:00