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

..

arrow_cursor.png

Update list menu graphics

2022-11-09 19:44:58 -05:00

blank.pal

decompile util.s

2017-09-13 12:58:57 +02:00

blank.png

decompile util.s

2017-09-13 12:58:57 +02:00

hof_pc_topbar.pal

Start remaining menu documentation

2021-11-03 17:38:08 -04:00

main_menu_bg.pal

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

main_menu_text.pal

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

menu_info1.pal

Start remaining menu documentation

2021-11-03 17:38:08 -04:00

menu_info2.pal

Start remaining menu documentation

2021-11-03 17:38:08 -04:00

menu_info3.pal

Start remaining menu documentation

2021-11-03 17:38:08 -04:00

menu_info.png

Matching merge from upstream pret

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

mon_markings_menu.png

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

mon_markings.png

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

mystery_gift_textbox_border.png

Clean up mystery gift menu

2021-10-16 23:58:11 -04:00

option_menu_equals_sign.png

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

option_menu_text.pal

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

outline_cursor.png

Update list menu graphics

2022-11-09 19:44:58 -05:00

red.pal

Update list menu graphics

2022-11-09 19:44:58 -05:00

scroll_indicator.png

Update list menu graphics

2022-11-09 19:44:58 -05:00

split_icons.png

merge wiith masteer and summary screen change

2020-05-29 12:50:54 +02:00

status_icons.png

Fix file permissions.

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

std_menu.pal

Finish menu documentation

2021-11-04 11:52:43 -04:00

swap_line.png

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

ui_learn_move.png

Fix file permissions.

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