Correcting DEZ Eggman-door VRAM

ArtTile_ArtNem_ConstructionStripes_1 is DEZ, not CPZ. ObjC6_SubObjData4 doesn't seem to "badly reuse mappings". It doesn't even seem to have ties to ArtTile_ArtNem_RobotnikUpper at all. ObjC6_SubObjData4 is probably that weird door that Eggman hides behind, not Eggman's upper half.
sonicretro · Aug 10, 2015 · f0fc3d7 · f0fc3d7
1 parent e2b87f3
commit f0fc3d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/s2.asm b/s2.asm
@@ -78264,7 +78264,7 @@ ObjC6_SubObjData3:
 	subObjData ObjC6_MapUnc_3D0EE,make_art_tile(ArtTile_ArtKos_LevelArt,0,0),4,5,$18,0
 ; off_3D0BC:
 ObjC6_SubObjData4:
-	subObjData ObjC6_MapUnc_3D1DE,make_art_tile(ArtTile_ArtNem_RobotnikUpper_DEZ,1,0),4,1,8,0
+	subObjData ObjC6_MapUnc_3D1DE,make_art_tile(ArtTile_ArtNem_ConstructionStripes_1,1,0),4,1,8,0
 ; off_3D0C6:
 ObjC6_SubObjData:
 	subObjData ObjC6_MapUnc_3D0EE,make_art_tile(ArtTile_ArtKos_LevelArt,0,0),4,5,4,0

diff --git a/s2.constants.asm b/s2.constants.asm
@@ -2225,7 +2225,6 @@ ArtTile_ArtUnc_CNZSlotPics_2_2p       = $0760
 ArtTile_ArtUnc_CNZSlotPics_3_2p       = $0770
 
 ; CPZ
-ArtTile_ArtNem_ConstructionStripes_1  = $0328
 ArtTile_ArtUnc_CPZAnimBack            = $0370
 ArtTile_ArtNem_CPZMetalThings         = $0373
 ArtTile_ArtNem_ConstructionStripes_2  = $0394
@@ -2241,6 +2240,7 @@ ArtTile_ArtNem_Spiny                  = $052D
 
 ; DEZ
 ArtTile_ArtUnc_DEZAnimBack            = $0326
+ArtTile_ArtNem_ConstructionStripes_1  = $0328
 
 ; ARZ
 ArtTile_ArtNem_ARZBarrierThing        = $03F8
@@ -2309,7 +2309,6 @@ ArtTile_ArtNem_WFZBoss                = $0379
 ArtTile_ArtNem_DEZBoss                = $0330
 ArtTile_ArtNem_DEZWindow              = $0378
 ArtTile_ArtNem_SilverSonic            = $0380
-ArtTile_ArtNem_RobotnikUpper_DEZ      = ArtTile_ArtNem_RobotnikUpper - $1D8 ; Bad reused mappings...
 
 ; ---------------------------------------------------------------------------
 ; Universal locations.