Merge branch 'master' into fix-eventobj

Browse Source

...

This commit is contained in:

GriffinR authored and GitHub committed 2020-01-12 22:42:43 -05:00

2 parents 635267ce32 fa5816915d

commit 655910a16f

127 files changed

+15606 -21934

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

graphics/battle_frontier/options_pal1.pal → graphics/battle_frontier/tourney.pal

File renamed without changes.

graphics/battle_frontier/options_pal2.pal → graphics/battle_frontier/tourney_buttons.pal

File renamed without changes.

graphics/battle_frontier/options.png → graphics/battle_frontier/tourney_buttons.png

File renamed without changes.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 576 B After Width:  |  Height:  |  Size: 576 B

graphics/battle_frontier/misc1.png → graphics/battle_frontier/tourney_info_card.png

File renamed without changes.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

graphics/unknown/unknown_D84F00.bin → graphics/battle_frontier/tourney_info_card_bg.bin

File renamed without changes.

graphics/unknown/unknown_D84970.bin → graphics/battle_frontier/tourney_info_card_tilemap.bin

File renamed without changes.

graphics/unknown/unknown_D83B2C.bin → graphics/battle_frontier/tourney_line_down_map.bin

File renamed without changes.

graphics/unknown/unknown_D83900.bin → graphics/battle_frontier/tourney_line_mask_map.bin

File renamed without changes.

graphics/unknown/unknown_D83C3C.bin → graphics/battle_frontier/tourney_line_up_map.bin

File renamed without changes.

graphics/battle_frontier/options_pal3.pal → graphics/battle_frontier/tourney_match_card_bg.pal

File renamed without changes.