diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-10 17:36:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 17:36:43 -0400 |
| commit | a9a427c6f268e04468c8e30242f3ed4f96036848 (patch) | |
| tree | 6bab63e3bd983d393f7182bcc271c3e0ab2d3b93 /graphics | |
| parent | 2859900ea9aa6f381006976fa94b95e6a4cad0b7 (diff) | |
| parent | a7815857ad8af1a35e69692e6eee3e854421b790 (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_transitions/regice.bin (renamed from graphics/battle_transitions/85BC314.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_transitions/regice.pal (renamed from graphics/battle_transitions/85BC2B4.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_transitions/regirock.bin (renamed from graphics/battle_transitions/85BD314.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_transitions/regirock.pal (renamed from graphics/battle_transitions/85BC2F4.pal) | 0 | ||||
| -rw-r--r-- | graphics/battle_transitions/regis.png (renamed from graphics/battle_transitions/85BBC14.png) | bin | 231 -> 231 bytes | |||
| -rw-r--r-- | graphics/battle_transitions/registeel.bin (renamed from graphics/battle_transitions/85BCB14.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/battle_transitions/registeel.pal (renamed from graphics/battle_transitions/85BC2D4.pal) | 0 |
7 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_transitions/85BC314.bin b/graphics/battle_transitions/regice.bin Binary files differindex 37149e37b..37149e37b 100644 --- a/graphics/battle_transitions/85BC314.bin +++ b/graphics/battle_transitions/regice.bin diff --git a/graphics/battle_transitions/85BC2B4.pal b/graphics/battle_transitions/regice.pal index f508de938..f508de938 100644 --- a/graphics/battle_transitions/85BC2B4.pal +++ b/graphics/battle_transitions/regice.pal diff --git a/graphics/battle_transitions/85BD314.bin b/graphics/battle_transitions/regirock.bin Binary files differindex cd1a672b5..cd1a672b5 100644 --- a/graphics/battle_transitions/85BD314.bin +++ b/graphics/battle_transitions/regirock.bin diff --git a/graphics/battle_transitions/85BC2F4.pal b/graphics/battle_transitions/regirock.pal index 2a65c3a9e..2a65c3a9e 100644 --- a/graphics/battle_transitions/85BC2F4.pal +++ b/graphics/battle_transitions/regirock.pal diff --git a/graphics/battle_transitions/85BBC14.png b/graphics/battle_transitions/regis.png Binary files differindex a08310737..a08310737 100644 --- a/graphics/battle_transitions/85BBC14.png +++ b/graphics/battle_transitions/regis.png diff --git a/graphics/battle_transitions/85BCB14.bin b/graphics/battle_transitions/registeel.bin Binary files differindex 29fde971c..29fde971c 100644 --- a/graphics/battle_transitions/85BCB14.bin +++ b/graphics/battle_transitions/registeel.bin diff --git a/graphics/battle_transitions/85BC2D4.pal b/graphics/battle_transitions/registeel.pal index 6a46ddacf..6a46ddacf 100644 --- a/graphics/battle_transitions/85BC2D4.pal +++ b/graphics/battle_transitions/registeel.pal |
