Eduardo Quezada 749225ace1 Matching merge from upstream pret ...

# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c

2023-01-20 12:31:54 -03:00

..

ability_pop_up.pal

add last used ball

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

ability_pop_up.png

larger ability popup, fix ability name printing/clearing, and config for longer ability names

2021-11-29 12:42:01 -05:00

alpha_indicator.png

Implemented Primal Reversion

2021-10-09 00:36:41 -03: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

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.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.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.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

Implemented Primal Reversion

2021-10-09 00:36:41 -03:00

status2.png

Combine/colorize status graphics

2023-01-13 12:53:08 -05:00

status3.png

Combine/colorize status graphics

2023-01-13 12:53:08 -05:00

status4.png

Combine/colorize status graphics

2023-01-13 12:53:08 -05:00

status.png

Combine/colorize status graphics

2023-01-13 12:53:08 -05: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

tweak z indicator position relative to healthbox

2022-07-18 09:44:04 -04:00