diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
| commit | f0b41debc35c2084aad6d369eab11a2d2df4ab44 (patch) | |
| tree | 9b720ab0b617fa207051efc7ff9373669f7dc47b /graphics/evolution_scene | |
| parent | a839463c849679974c986bf9c9c260eff0e94cb7 (diff) | |
| parent | 9f5bf65fb336cf7a3ba68d32267bf993f0f6a494 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
Diffstat (limited to 'graphics/evolution_scene')
| -rw-r--r-- | graphics/evolution_scene/bg_anim.pal (renamed from graphics/evolution_scene/transition.pal) | 0 | ||||
| -rw-r--r-- | graphics/evolution_scene/bg_anim_intro.pal (renamed from graphics/evolution_scene/gray_transition_intro.pal) | 0 | ||||
| -rw-r--r-- | graphics/evolution_scene/bg_inner.bin (renamed from graphics/evolution_scene/bg.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/evolution_scene/bg_outer.bin (renamed from graphics/evolution_scene/bg2.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/evolution_scene/unused_1.pal (renamed from graphics/evolution_scene/unknown_5B4114.pal) | 0 | ||||
| -rw-r--r-- | graphics/evolution_scene/unused_2.pal (renamed from graphics/evolution_scene/gray_transition_lighten.pal) | 0 | ||||
| -rw-r--r-- | graphics/evolution_scene/unused_3.pal (renamed from graphics/evolution_scene/gray_transition_darken.pal) | 0 | ||||
| -rw-r--r-- | graphics/evolution_scene/unused_4.pal (renamed from graphics/evolution_scene/gray_transition_outro.pal) | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/graphics/evolution_scene/transition.pal b/graphics/evolution_scene/bg_anim.pal index b0f4d3815..b0f4d3815 100644 --- a/graphics/evolution_scene/transition.pal +++ b/graphics/evolution_scene/bg_anim.pal diff --git a/graphics/evolution_scene/gray_transition_intro.pal b/graphics/evolution_scene/bg_anim_intro.pal index 323623a15..323623a15 100644 --- a/graphics/evolution_scene/gray_transition_intro.pal +++ b/graphics/evolution_scene/bg_anim_intro.pal diff --git a/graphics/evolution_scene/bg.bin b/graphics/evolution_scene/bg_inner.bin Binary files differindex 583ebac2b..583ebac2b 100644 --- a/graphics/evolution_scene/bg.bin +++ b/graphics/evolution_scene/bg_inner.bin diff --git a/graphics/evolution_scene/bg2.bin b/graphics/evolution_scene/bg_outer.bin Binary files differindex 7afab112a..7afab112a 100644 --- a/graphics/evolution_scene/bg2.bin +++ b/graphics/evolution_scene/bg_outer.bin diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unused_1.pal index 2cd4981fd..2cd4981fd 100644 --- a/graphics/evolution_scene/unknown_5B4114.pal +++ b/graphics/evolution_scene/unused_1.pal diff --git a/graphics/evolution_scene/gray_transition_lighten.pal b/graphics/evolution_scene/unused_2.pal index 813db93dc..813db93dc 100644 --- a/graphics/evolution_scene/gray_transition_lighten.pal +++ b/graphics/evolution_scene/unused_2.pal diff --git a/graphics/evolution_scene/gray_transition_darken.pal b/graphics/evolution_scene/unused_3.pal index 97d117330..97d117330 100644 --- a/graphics/evolution_scene/gray_transition_darken.pal +++ b/graphics/evolution_scene/unused_3.pal diff --git a/graphics/evolution_scene/gray_transition_outro.pal b/graphics/evolution_scene/unused_4.pal index f122f40fe..f122f40fe 100644 --- a/graphics/evolution_scene/gray_transition_outro.pal +++ b/graphics/evolution_scene/unused_4.pal |