diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /graphics | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_interface/healthbox_doubles_frameend.png | bin | 0 -> 5681 bytes | |||
| -rw-r--r-- | graphics/battle_interface/healthbox_doubles_frameend_bar.png | bin | 0 -> 5762 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/bg.bin (renamed from graphics/frontier_pass/tiles.bin) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/bg.pal (renamed from graphics/frontier_pass/tiles.pal) | 0 | ||||
| -rw-r--r-- | graphics/frontier_pass/bg.png (renamed from graphics/frontier_pass/tiles.png) | bin | 4011 -> 4011 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/cancel.bin (renamed from graphics/frontier_pass/tilemap1.bin) | bin | 36 -> 36 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/cancel_highlighted.bin (renamed from graphics/frontier_pass/tilemap2.bin) | bin | 36 -> 36 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/map_and_card.png (renamed from graphics/frontier_pass/tiles2.png) | bin | 2765 -> 2765 bytes | |||
| -rw-r--r-- | graphics/frontier_pass/unused.bin (renamed from graphics/frontier_pass/unknown_571298.bin) | 0 | ||||
| -rw-r--r-- | graphics/unknown/unknown_D12FEC.png | bin | 84 -> 0 bytes | |||
| -rw-r--r-- | graphics/unknown/unknown_D1300C.png | bin | 92 -> 0 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_interface/healthbox_doubles_frameend.png b/graphics/battle_interface/healthbox_doubles_frameend.png Binary files differnew file mode 100644 index 000000000..812a6c2c4 --- /dev/null +++ b/graphics/battle_interface/healthbox_doubles_frameend.png diff --git a/graphics/battle_interface/healthbox_doubles_frameend_bar.png b/graphics/battle_interface/healthbox_doubles_frameend_bar.png Binary files differnew file mode 100644 index 000000000..7bb1f0d4c --- /dev/null +++ b/graphics/battle_interface/healthbox_doubles_frameend_bar.png diff --git a/graphics/frontier_pass/tiles.bin b/graphics/frontier_pass/bg.bin Binary files differindex e4e066ebe..e4e066ebe 100644 --- a/graphics/frontier_pass/tiles.bin +++ b/graphics/frontier_pass/bg.bin diff --git a/graphics/frontier_pass/tiles.pal b/graphics/frontier_pass/bg.pal index 2bfcff098..2bfcff098 100644 --- a/graphics/frontier_pass/tiles.pal +++ b/graphics/frontier_pass/bg.pal diff --git a/graphics/frontier_pass/tiles.png b/graphics/frontier_pass/bg.png Binary files differindex 520c34b3d..520c34b3d 100644 --- a/graphics/frontier_pass/tiles.png +++ b/graphics/frontier_pass/bg.png diff --git a/graphics/frontier_pass/tilemap1.bin b/graphics/frontier_pass/cancel.bin Binary files differindex c2aa0dc9a..c2aa0dc9a 100644 --- a/graphics/frontier_pass/tilemap1.bin +++ b/graphics/frontier_pass/cancel.bin diff --git a/graphics/frontier_pass/tilemap2.bin b/graphics/frontier_pass/cancel_highlighted.bin Binary files differindex 63c2f9b14..63c2f9b14 100644 --- a/graphics/frontier_pass/tilemap2.bin +++ b/graphics/frontier_pass/cancel_highlighted.bin diff --git a/graphics/frontier_pass/tiles2.png b/graphics/frontier_pass/map_and_card.png Binary files differindex 6bd420a8d..6bd420a8d 100644 --- a/graphics/frontier_pass/tiles2.png +++ b/graphics/frontier_pass/map_and_card.png diff --git a/graphics/frontier_pass/unknown_571298.bin b/graphics/frontier_pass/unused.bin index a781f0b39..a781f0b39 100644 --- a/graphics/frontier_pass/unknown_571298.bin +++ b/graphics/frontier_pass/unused.bin diff --git a/graphics/unknown/unknown_D12FEC.png b/graphics/unknown/unknown_D12FEC.png Binary files differdeleted file mode 100644 index 96c49a992..000000000 --- a/graphics/unknown/unknown_D12FEC.png +++ /dev/null diff --git a/graphics/unknown/unknown_D1300C.png b/graphics/unknown/unknown_D1300C.png Binary files differdeleted file mode 100644 index 0c077dd0b..000000000 --- a/graphics/unknown/unknown_D1300C.png +++ /dev/null |
