diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 22:42:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 22:42:43 -0500 |
| commit | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (patch) | |
| tree | a619369a0d8b263f82d660ad7800f4b42328bb07 /graphics | |
| parent | 635267ce32bd696fe15391449efdf07fa35cf449 (diff) | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_frontier/tourney.pal (renamed from graphics/battle_frontier/options_pal1.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_frontier/tourney_buttons.pal (renamed from graphics/battle_frontier/options_pal2.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_frontier/tourney_buttons.png (renamed from graphics/battle_frontier/options.png) | bin | 576 -> 576 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_info_card.png (renamed from graphics/battle_frontier/misc1.png) | bin | 1606 -> 1606 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_info_card_bg.bin (renamed from graphics/unknown/unknown_D84F00.bin) | 0 | ||||
| -rw-r--r-- | graphics/battle_frontier/tourney_info_card_tilemap.bin (renamed from graphics/unknown/unknown_D84970.bin) | bin | 8192 -> 8192 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_line_down_map.bin (renamed from graphics/unknown/unknown_D83B2C.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_line_mask_map.bin (renamed from graphics/unknown/unknown_D83900.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_line_up_map.bin (renamed from graphics/unknown/unknown_D83C3C.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_frontier/tourney_match_card_bg.pal (renamed from graphics/battle_frontier/options_pal3.pal) | 0 |
10 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_frontier/options_pal1.pal b/graphics/battle_frontier/tourney.pal index eec4c7d71..eec4c7d71 100644 --- a/graphics/battle_frontier/options_pal1.pal +++ b/graphics/battle_frontier/tourney.pal diff --git a/graphics/battle_frontier/options_pal2.pal b/graphics/battle_frontier/tourney_buttons.pal index 4a7c1f786..4a7c1f786 100644 --- a/graphics/battle_frontier/options_pal2.pal +++ b/graphics/battle_frontier/tourney_buttons.pal diff --git a/graphics/battle_frontier/options.png b/graphics/battle_frontier/tourney_buttons.png Binary files differindex 0d8cec998..0d8cec998 100644 --- a/graphics/battle_frontier/options.png +++ b/graphics/battle_frontier/tourney_buttons.png diff --git a/graphics/battle_frontier/misc1.png b/graphics/battle_frontier/tourney_info_card.png Binary files differindex a3c225c89..a3c225c89 100644 --- a/graphics/battle_frontier/misc1.png +++ b/graphics/battle_frontier/tourney_info_card.png diff --git a/graphics/unknown/unknown_D84F00.bin b/graphics/battle_frontier/tourney_info_card_bg.bin index c38088d34..c38088d34 100644 --- a/graphics/unknown/unknown_D84F00.bin +++ b/graphics/battle_frontier/tourney_info_card_bg.bin diff --git a/graphics/unknown/unknown_D84970.bin b/graphics/battle_frontier/tourney_info_card_tilemap.bin Binary files differindex d102290e4..d102290e4 100644 --- a/graphics/unknown/unknown_D84970.bin +++ b/graphics/battle_frontier/tourney_info_card_tilemap.bin diff --git a/graphics/unknown/unknown_D83B2C.bin b/graphics/battle_frontier/tourney_line_down_map.bin Binary files differindex 34175237e..34175237e 100644 --- a/graphics/unknown/unknown_D83B2C.bin +++ b/graphics/battle_frontier/tourney_line_down_map.bin diff --git a/graphics/unknown/unknown_D83900.bin b/graphics/battle_frontier/tourney_line_mask_map.bin Binary files differindex 7f3e36737..7f3e36737 100644 --- a/graphics/unknown/unknown_D83900.bin +++ b/graphics/battle_frontier/tourney_line_mask_map.bin diff --git a/graphics/unknown/unknown_D83C3C.bin b/graphics/battle_frontier/tourney_line_up_map.bin Binary files differindex acf7cf6ad..acf7cf6ad 100644 --- a/graphics/unknown/unknown_D83C3C.bin +++ b/graphics/battle_frontier/tourney_line_up_map.bin diff --git a/graphics/battle_frontier/options_pal3.pal b/graphics/battle_frontier/tourney_match_card_bg.pal index 912d5e9ec..912d5e9ec 100644 --- a/graphics/battle_frontier/options_pal3.pal +++ b/graphics/battle_frontier/tourney_match_card_bg.pal |
