Merge commit 'e1cce1c' into merge-mrwint

Conflicts:
	main.asm

28 files changed, 33 insertions, 75 deletions

diff --git a/gfx/intro/001.lz b/gfx/intro/001.lz
index 467aa27c1..926fb6e8e 100644
--- a/gfx/intro/001.lz
+++ b/gfx/intro/001.lz
diff --git a/gfx/intro/002.lz b/gfx/intro/002.lz
index 1f460c26d..c63f215f2 100644
--- a/gfx/intro/002.lz
+++ b/gfx/intro/002.lz
diff --git a/gfx/intro/003.lz b/gfx/intro/003.lz
index 30ef28817..182ffb130 100644
--- a/gfx/intro/003.lz
+++ b/gfx/intro/003.lz
diff --git a/gfx/intro/004.lz b/gfx/intro/004.lz
index dda9d45a4..5897d176b 100644
--- a/gfx/intro/004.lz
+++ b/gfx/intro/004.lz
diff --git a/gfx/intro/005.lz b/gfx/intro/005.lz
index aabd0661e..0ae96b7f7 100644
--- a/gfx/intro/005.lz
+++ b/gfx/intro/005.lz
diff --git a/gfx/intro/006.lz b/gfx/intro/006.lz
index b9de6c532..46436b607 100644
--- a/gfx/intro/006.lz
+++ b/gfx/intro/006.lz
diff --git a/gfx/intro/007.lz b/gfx/intro/007.lz
index d1974ec77..d1694ed3e 100644
--- a/gfx/intro/007.lz
+++ b/gfx/intro/007.lz
diff --git a/gfx/intro/008.lz b/gfx/intro/008.lz
index ffd675a6d..356c6d5e8 100644
--- a/gfx/intro/008.lz
+++ b/gfx/intro/008.lz
diff --git a/gfx/intro/009.lz b/gfx/intro/009.lz
index f419a8924..238d6a60e 100644
--- a/gfx/intro/009.lz
+++ b/gfx/intro/009.lz
diff --git a/gfx/intro/010.lz b/gfx/intro/010.lz
index fb2c453d0..6e45c45f7 100644
--- a/gfx/intro/010.lz
+++ b/gfx/intro/010.lz
diff --git a/gfx/intro/011.lz b/gfx/intro/011.lz
index e565424a1..68ceb19f8 100644
--- a/gfx/intro/011.lz
+++ b/gfx/intro/011.lz
diff --git a/gfx/intro/012.lz b/gfx/intro/012.lz
index 4c35460fc..0d6af294c 100644
--- a/gfx/intro/012.lz
+++ b/gfx/intro/012.lz
diff --git a/gfx/intro/013.lz b/gfx/intro/013.lz
index 0887b9a14..91635527c 100644
--- a/gfx/intro/013.lz
+++ b/gfx/intro/013.lz
diff --git a/gfx/intro/014.lz b/gfx/intro/014.lz
index 8ec565388..a892ab1b4 100644
--- a/gfx/intro/014.lz
+++ b/gfx/intro/014.lz
diff --git a/gfx/intro/015.lz b/gfx/intro/015.lz
index 3fc339a46..22a4cc926 100644
--- a/gfx/intro/015.lz
+++ b/gfx/intro/015.lz
diff --git a/gfx/intro/017.lz b/gfx/intro/017.lz
index 335d39558..90ce59e58 100644
--- a/gfx/intro/017.lz
+++ b/gfx/intro/017.lz
diff --git a/gfx/intro/background.lz b/gfx/intro/background.lz
index 7d3fc52f7..1ef2f1203 100644
--- a/gfx/intro/background.lz
+++ b/gfx/intro/background.lz
diff --git a/gfx/intro/crystal_unowns.lz b/gfx/intro/crystal_unowns.lz
index bee906290..2585d9c52 100644
--- a/gfx/intro/crystal_unowns.lz
+++ b/gfx/intro/crystal_unowns.lz
diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.lz
index bd93412c0..5beb0e6ef 100644
--- a/gfx/intro/logo.lz
+++ b/gfx/intro/logo.lz
diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.lz
index c2a325bb7..90174a098 100644
--- a/gfx/intro/pichu_wooper.lz
+++ b/gfx/intro/pichu_wooper.lz
diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.lz
index 3ce37c136..5a7fec1a9 100644
--- a/gfx/intro/pulse.lz
+++ b/gfx/intro/pulse.lz
diff --git a/gfx/intro/suicune_back.lz b/gfx/intro/suicune_back.lz
index 4d13fdc4b..470d78b5b 100644
--- a/gfx/intro/suicune_back.lz
+++ b/gfx/intro/suicune_back.lz
diff --git a/gfx/intro/suicune_close.lz b/gfx/intro/suicune_close.lz
index c3b0d30b7..19b806269 100644
--- a/gfx/intro/suicune_close.lz
+++ b/gfx/intro/suicune_close.lz
diff --git a/gfx/intro/suicune_jump.lz b/gfx/intro/suicune_jump.lz
index 9c55bccd0..b34a0c765 100644
--- a/gfx/intro/suicune_jump.lz
+++ b/gfx/intro/suicune_jump.lz
diff --git a/gfx/intro/suicune_run.lz b/gfx/intro/suicune_run.lz
index 977e01230..f48162258 100644
--- a/gfx/intro/suicune_run.lz
+++ b/gfx/intro/suicune_run.lz
diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.lz
index a1c49ed3a..21cae2927 100644
--- a/gfx/intro/unown_back.lz
+++ b/gfx/intro/unown_back.lz
diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.lz
index 882af3b34..67e90b0b6 100644
--- a/gfx/intro/unowns.lz
+++ b/gfx/intro/unowns.lz
diff --git a/main.asm b/main.asm
index a34979454..afa3ac970 100644
--- a/main.asm
+++ b/main.asm
@@ -105711,159 +105711,119 @@ Functione552f: ; e552f (39:552f)
 
 IntroSuicuneRunGFX: ; e555d
 INCBIN "gfx/intro/suicune_run.lz"
-; e592b
-
-INCBIN "baserom.gbc",$e592b,$e592d - $e592b
+; e592d
 
 IntroPichuWooperGFX: ; e592d
 INCBIN "gfx/intro/pichu_wooper.lz"
-; e5c70
-
-INCBIN "baserom.gbc",$e5c70,$e5c7d - $e5c70
+; e5c7d
 
 IntroBackgroundGFX: ; e5c7d
 INCBIN "gfx/intro/background.lz"
-; e5e69
-
-INCBIN "baserom.gbc",$e5e69,$e5e6d - $e5e69
+; e5e6d
 
 IntroTilemap004: ; e5e6d
 INCBIN "gfx/intro/004.lz"
-; e5ec5
-
-INCBIN "baserom.gbc",$e5ec5,$e5ecd - $e5ec5
+; e5ecd
 
 IntroTilemap003: ; e5ecd
 INCBIN "gfx/intro/003.lz"
-; e5ed9
+; e5edd
 
-INCBIN "baserom.gbc",$e5ed9,$e5f5d - $e5ed9
+INCBIN "baserom.gbc", $e5edd, $e5f5d - $e5edd
 
 IntroUnownsGFX: ; e5f5d
 INCBIN "gfx/intro/unowns.lz"
-; e6348
-
-INCBIN "baserom.gbc",$e6348,$e634d - $e6348
+; e634d
 
 IntroPulseGFX: ; e634d
 INCBIN "gfx/intro/pulse.lz"
-; e63d4
-
-INCBIN "baserom.gbc",$e63d4,$e63dd - $e63d4
+; e63dd
 
 IntroTilemap002: ; e63dd
 INCBIN "gfx/intro/002.lz"
-; e6418
-
-INCBIN "baserom.gbc",$e6418,$e641d - $e6418
+; e641d
 
 IntroTilemap001: ; e641d
 INCBIN "gfx/intro/001.lz"
-; e6429
-
-INCBIN "baserom.gbc",$e6429,$e642d - $e6429
+; e642d
 
 IntroTilemap006: ; e642d
 INCBIN "gfx/intro/006.lz"
-; e6472
-
-INCBIN "baserom.gbc",$e6472,$e647d - $e6472
+; e647d
 
 IntroTilemap005: ; e647d
 INCBIN "gfx/intro/005.lz"
-; e6498
-
-INCBIN "baserom.gbc",$e6498,$e649d - $e6498
+; e649d
 
 IntroTilemap008: ; e649d
 INCBIN "gfx/intro/008.lz"
-; e6550
-
-INCBIN "baserom.gbc",$e6550,$e655d - $e6550
+; e655d
 
 IntroTilemap007: ; e655d
 INCBIN "gfx/intro/007.lz"
-; e65a4
+; e65ad
 
-INCBIN "baserom.gbc",$e65a4,$e662d - $e65a4
+INCBIN "baserom.gbc", $e65ad, $e662d - $e65ad
 
 IntroCrystalUnownsGFX: ; e662d
 INCBIN "gfx/intro/crystal_unowns.lz"
-; e6720
-
-INCBIN "baserom.gbc",$e6720,$e672d - $e6720
+; e672d
 
 IntroTilemap017: ; e672d
 INCBIN "gfx/intro/017.lz"
-; e6761
-
-INCBIN "baserom.gbc",$e6761,$e676d - $e6761
+; e676d
 
 IntroTilemap015: ; e676d
 INCBIN "gfx/intro/015.lz"
-; e6794
+; e679d
 
-INCBIN "baserom.gbc",$e6794,$e681d - $e6794
+INCBIN "baserom.gbc", $e679d, $e681d - $e679d
 
 IntroSuicuneCloseGFX: ; e681d
 INCBIN "gfx/intro/suicune_close.lz"
-; e6c37
-
-INCBIN "baserom.gbc",$e6c37,$e6c3d - $e6c37
+; e6c3d
 
 IntroTilemap012: ; e6c3d
 INCBIN "gfx/intro/012.lz"
-; e6d0a
-
-INCBIN "baserom.gbc",$e6d0a,$e6d0d - $e6d0a
+; e6d0d
 
 IntroTilemap011: ; e6d0d
 INCBIN "gfx/intro/011.lz"
-; e6d65
+; e6d6d
 
-INCBIN "baserom.gbc",$e6d65,$e6ded - $e6d65
+INCBIN "baserom.gbc", $e6d6d, $e6ded - $e6d6d
 
 IntroSuicuneJumpGFX: ; e6ded
 INCBIN "gfx/intro/suicune_jump.lz"
-; e72a7
-
-INCBIN "baserom.gbc",$e72a7,$e72ad - $e72a7
+; e72ad
 
 IntroSuicuneBackGFX: ; e72ad
 INCBIN "gfx/intro/suicune_back.lz"
-; e7648
-
-INCBIN "baserom.gbc",$e7648,$e764d - $e7648
+; e764d
 
 IntroTilemap010: ; e764d
 INCBIN "gfx/intro/010.lz"
-; e76a0
-
-INCBIN "baserom.gbc",$e76a0,$e76ad - $e76a0
+; e76ad
 
 IntroTilemap009: ; e76ad
 INCBIN "gfx/intro/009.lz"
-; e76bb
-
-INCBIN "baserom.gbc",$e76bb,$e76bd - $e76bb
+; e76bd
 
 IntroTilemap014: ; e76bd
 INCBIN "gfx/intro/014.lz"
-; e778b
-
-INCBIN "baserom.gbc",$e778b,$e778d - $e778b
+; e778d
 
 IntroTilemap013: ; e778d
 INCBIN "gfx/intro/013.lz"
-; e77d9
+; e77dd
 
-INCBIN "baserom.gbc",$e77d9,$e785d - $e77d9
+INCBIN "baserom.gbc", $e77dd, $e785d - $e77dd
 
 IntroUnownBackGFX: ; e785d
 INCBIN "gfx/intro/unown_back.lz"
-; e799a
+; e799d
 
-INCBIN "baserom.gbc",$e799a,$e7a70 - $e799a
+INCBIN "baserom.gbc", $e799d, $e7a70 - $e799d
 
 
 ; ================================================================
@@ -115165,9 +115125,7 @@ INCBIN "baserom.gbc",$108bec,$109407 - $108bec
 
 IntroLogoGFX: ; 109407
 INCBIN "gfx/intro/logo.lz"
-; 10983f
-
-INCBIN "baserom.gbc",$10983f,$109847 - $10983f
+; 109847
 
 
 Function109847: ; 109847