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

add last used ball

2021-06-25 13:37:59 -06:00

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

Extract baseroms from battle_interface

2017-09-30 16:37:53 -05:00

ball_status_bar.png

Extract baseroms from battle_interface

2017-09-30 16:37:53 -05:00

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

Fix file permissions.

2018-01-19 15:06:49 -05:00

expbar.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

healthbox_doubles_frameend_bar.png

Identify unknown healthbox GFX

2021-09-06 10:42:05 -04:00

healthbox_doubles_frameend.png

Identify unknown healthbox GFX

2021-09-06 10:42:05 -04:00

healthbox_doubles_opponent.png

Give labels to healthbox gfx

2018-09-20 21:42:38 +02:00

healthbox_doubles_player.png

Give labels to healthbox gfx

2018-09-20 21:42:38 +02:00

healthbox_safari.png

Give labels to healthbox gfx

2018-09-20 21:42:38 +02:00

healthbox_singles_opponent.png

Give labels to healthbox gfx

2018-09-20 21:42:38 +02:00

healthbox_singles_player.png

Give labels to healthbox gfx

2018-09-20 21:42:38 +02:00

hpbar_anim_unused.png

Move starter choose out of interface/misc

2022-01-11 17:49:08 -05:00

hpbar_anim.png

gfx: fix hpbar_anim.png visual palette

2020-05-01 20:51:29 +02:00

hpbar_unused.png

Move starter choose out of interface/misc

2022-01-11 17:49:08 -05:00

hpbar.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

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

change last ball graphic based on config. replace saveblock field with ewram field

2021-09-23 12:03:01 -04:00

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

change last ball graphic based on config. replace saveblock field with ewram field

2021-09-23 12:03:01 -04:00

level_up_banner.png

More battle doc, add battle window ids

2021-10-09 03:01:10 -04:00

mega_indicator.png

Tweak up mega evo

2019-05-02 23:10:01 +02:00

mega_trigger.pal

New mega trigger sprite

2018-09-20 20:59:00 +02:00

mega_trigger.png

New mega trigger sprite

2018-09-20 20:59:00 +02:00

misc_frameend.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

misc_indicator.pal

dynamax indicator shares palette with alpha/omega

2023-03-11 10:47:23 -08:00

misc.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

numbers1.png

Move starter choose out of interface/misc

2022-01-11 17:49:08 -05:00

numbers2.png

Move starter choose out of interface/misc

2022-01-11 17:49:08 -05:00

omega_indicator.png

alpha omega indicator sprites use the same palete

2023-03-06 15:22:28 +01: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

status.png

Add Frostbite status

2023-04-22 18:23:08 +02:00

text_pp.pal

Fix some battle dome graphics names

2022-01-11 10:04:47 -05:00

text.pal

Document some battle_bg-related things

2019-11-07 18:24:04 -06:00

textbox_0.pal

Document battle ui

2018-11-22 01:10:50 +00:00

textbox_1.pal

Document battle ui

2018-11-22 01:10:50 +00:00

textbox_map.bin

Document battle ui

2018-11-22 01:10:50 +00:00

textbox.png

Document battle ui

2018-11-22 01:10:50 +00:00

unused_status_summary.png

Label remaining symbols in graphics.c

2021-10-27 13:47:18 -04:00

unused_window2.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

unused_window2bar.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

unused_window3.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

unused_window4.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

unused_window.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

z_move_trigger.png

Purged the bKGD warning once and for all

2023-02-24 02:01:55 -03:00