ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
d103025527
pokeemerald/graphics/interface
History
Eduardo Quezada e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -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_info.png Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08: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
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