Merge commit 'e1cce1c' into merge-mrwint

Conflicts: main.asm
2025-04-09 05:44:44 -07:00 · 2013-10-25 17:06:19 -04:00 · 2013-10-25 17:06:19 -04:00 · 15a6bd55f4
commit 15a6bd55f4
parent 32ede188d7 e1cce1cfb9
28 changed files with 33 additions and 75 deletions
--- a/gfx/intro/001.lz
+++ b/gfx/intro/001.lz
--- a/gfx/intro/002.lz
+++ b/gfx/intro/002.lz
--- a/gfx/intro/003.lz
+++ b/gfx/intro/003.lz
--- a/gfx/intro/004.lz
+++ b/gfx/intro/004.lz
--- a/gfx/intro/005.lz
+++ b/gfx/intro/005.lz
--- a/gfx/intro/006.lz
+++ b/gfx/intro/006.lz
--- a/gfx/intro/007.lz
+++ b/gfx/intro/007.lz
--- a/gfx/intro/008.lz
+++ b/gfx/intro/008.lz
--- a/gfx/intro/009.lz
+++ b/gfx/intro/009.lz
--- a/gfx/intro/010.lz
+++ b/gfx/intro/010.lz
--- a/gfx/intro/011.lz
+++ b/gfx/intro/011.lz
--- a/gfx/intro/012.lz
+++ b/gfx/intro/012.lz
--- a/gfx/intro/013.lz
+++ b/gfx/intro/013.lz
--- a/gfx/intro/014.lz
+++ b/gfx/intro/014.lz
--- a/gfx/intro/015.lz
+++ b/gfx/intro/015.lz
--- a/gfx/intro/017.lz
+++ b/gfx/intro/017.lz
--- a/gfx/intro/background.lz
+++ b/gfx/intro/background.lz
--- a/gfx/intro/crystal_unowns.lz
+++ b/gfx/intro/crystal_unowns.lz
--- a/gfx/intro/logo.lz
+++ b/gfx/intro/logo.lz
--- a/gfx/intro/pichu_wooper.lz
+++ b/gfx/intro/pichu_wooper.lz
--- a/Show More
+++ b/Show More