Tidy-up VRAM constants some more.

1 files changed, 72 insertions, 72 deletions

diff --git a/_inc/Pattern Load Cues.asm b/_inc/Pattern Load Cues.asm
index eecff7e..5bbf63e 100644
--- a/_inc/Pattern Load Cues.asm
+++ b/_inc/Pattern Load Cues.asm
@@ -79,54 +79,54 @@ PLC_GameOverend:
 ; Pattern load cues - Green Hill
 ; ---------------------------------------------------------------------------
 PLC_GHZ:	dc.w ((PLC_GHZ2-PLC_GHZ-2)/6)-1
-		plcm	Nem_GHZ_1st,   ArtTile_Level             ; GHZ main patterns
-		plcm	Nem_GHZ_2nd,   ArtTile_Level+$1CD        ; GHZ secondary patterns
-		plcm	Nem_Stalk,     ArtTile_GHZ_Flower_Stalk  ; flower stalk
-		plcm	Nem_PplRock,   ArtTile_Purple_Rock       ; purple rock
-		plcm	Nem_Crabmeat,  ArtTile_Crabmeat          ; crabmeat enemy
-		plcm	Nem_Buzz,      ArtTile_Buzz_Bomber       ; buzz bomber enemy
-		plcm	Nem_Chopper,   ArtTile_Chopper           ; chopper enemy
-		plcm	Nem_Newtron,   ArtTile_Newtron           ; newtron enemy
-		plcm	Nem_Motobug,   ArtTile_Moto_Bug          ; motobug enemy
-		plcm	Nem_Spikes,    ArtTile_Spikes            ; spikes
-		plcm	Nem_HSpring,   ArtTile_Spring_Horizontal ; horizontal spring
-		plcm	Nem_VSpring,   ArtTile_Spring_Vertical   ; vertical spring
+		plcm	Nem_GHZ_1st,   ArtTile_Level                  ; GHZ main patterns
+		plcm	Nem_GHZ_2nd,   ArtTile_Level+$1CD             ; GHZ secondary patterns
+		plcm	Nem_Stalk,     ArtTile_GHZ_Flower_Stalk       ; flower stalk
+		plcm	Nem_PplRock,   ArtTile_GHZ_Purple_Rock        ; purple rock
+		plcm	Nem_Crabmeat,  ArtTile_Crabmeat               ; crabmeat enemy
+		plcm	Nem_Buzz,      ArtTile_Buzz_Bomber            ; buzz bomber enemy
+		plcm	Nem_Chopper,   ArtTile_Chopper                ; chopper enemy
+		plcm	Nem_Newtron,   ArtTile_Newtron                ; newtron enemy
+		plcm	Nem_Motobug,   ArtTile_Moto_Bug               ; motobug enemy
+		plcm	Nem_Spikes,    ArtTile_Spikes                 ; spikes
+		plcm	Nem_HSpring,   ArtTile_Spring_Horizontal      ; horizontal spring
+		plcm	Nem_VSpring,   ArtTile_Spring_Vertical        ; vertical spring
 
 PLC_GHZ2:	dc.w ((PLC_GHZ2end-PLC_GHZ2-2)/6)-1
-		plcm	Nem_Swing,     ArtTile_Swing_GHZ_MZ      ; swinging platform
-		plcm	Nem_Bridge,    ArtTile_Bridge            ; bridge
-		plcm	Nem_SpikePole, ArtTile_GHZ_Spike_Pole    ; spiked pole
-		plcm	Nem_Ball,      ArtTile_Wrecking_Ball     ; giant ball
-		plcm	Nem_GhzWall1,  ArtTile_Smashable_Wall    ; breakable wall
-		plcm	Nem_GhzWall2,  ArtTile_GHZ_Edge_Wall     ; normal wall
+		plcm	Nem_Swing,     ArtTile_GHZ_MZ_Swing           ; swinging platform
+		plcm	Nem_Bridge,    ArtTile_GHZ_Bridge             ; bridge
+		plcm	Nem_SpikePole, ArtTile_GHZ_Spike_Pole         ; spiked pole
+		plcm	Nem_Ball,      ArtTile_GHZ_Giant_Ball         ; giant ball
+		plcm	Nem_GhzWall1,  ArtTile_GHZ_SLZ_Smashable_Wall ; breakable wall
+		plcm	Nem_GhzWall2,  ArtTile_GHZ_Edge_Wall          ; normal wall
 PLC_GHZ2end:
 ; ---------------------------------------------------------------------------
 ; Pattern load cues - Labyrinth
 ; ---------------------------------------------------------------------------
 PLC_LZ:		dc.w ((PLC_LZ2-PLC_LZ-2)/6)-1
 		plcm	Nem_LZ,          ArtTile_Level              ; LZ main patterns
-		plcm	Nem_LzBlock1,    $1E0                       ; block
-		plcm	Nem_LzBlock2,    $1F0                       ; blocks
+		plcm	Nem_LzBlock1,    ArtTile_LZ_Block_1         ; block
+		plcm	Nem_LzBlock2,    ArtTile_LZ_Block_2         ; blocks
 		plcm	Nem_Splash,      ArtTile_Splash             ; waterfalls and splash
-		plcm	Nem_Water,       ArtTile_Water_Surface      ; water surface
-		plcm	Nem_LzSpikeBall, ArtTile_Spikeball_Chain_LZ ; spiked ball
-		plcm	Nem_FlapDoor,    ArtTile_Flapping_Door      ; flapping door
-		plcm	Nem_Bubbles,     ArtTile_Bubbles            ; bubbles and numbers
-		plcm	Nem_LzBlock3,    ArtTile_Moving_Block_LZ    ; block
+		plcm	Nem_Water,       ArtTile_LZ_Water_Surface   ; water surface
+		plcm	Nem_LzSpikeBall, ArtTile_LZ_Spikeball_Chain ; spiked ball
+		plcm	Nem_FlapDoor,    ArtTile_LZ_Flapping_Door   ; flapping door
+		plcm	Nem_Bubbles,     ArtTile_LZ_Bubbles         ; bubbles and numbers
+		plcm	Nem_LzBlock3,    ArtTile_LZ_Moving_Block    ; block
 		plcm	Nem_LzDoor1,     ArtTile_LZ_Door            ; vertical door
-		plcm	Nem_Harpoon,     ArtTile_Harpoon            ; harpoon
+		plcm	Nem_Harpoon,     ArtTile_LZ_Harpoon         ; harpoon
 		plcm	Nem_Burrobot,    ArtTile_Burrobot           ; burrobot enemy
 
 PLC_LZ2:	dc.w ((PLC_LZ2end-PLC_LZ2-2)/6)-1
-		plcm	Nem_LzPole,      ArtTile_Pole               ; pole that breaks
+		plcm	Nem_LzPole,      ArtTile_LZ_Pole            ; pole that breaks
 		plcm	Nem_LzDoor2,     ArtTile_LZ_Blocks          ; large horizontal door
-		plcm	Nem_LzWheel,     ArtTile_Conveyor_Belt      ; wheel
-		plcm	Nem_Gargoyle,    ArtTile_Gargoyle           ; gargoyle head
+		plcm	Nem_LzWheel,     ArtTile_LZ_Conveyor_Belt   ; wheel
+		plcm	Nem_Gargoyle,    ArtTile_LZ_Gargoyle        ; gargoyle head
 	if Revision=0
-		plcm	Nem_LzSonic,     $440                       ; Sonic holding his breath
+		plcm	Nem_LzSonic,     ArtTile_LZ_Sonic_Drowning  ; Sonic holding his breath
 	endif
-		plcm	Nem_LzPlatfm,    $44F                       ; rising platform
-		plcm	Nem_Orbinaut,    ArtTile_Orbinaut_LZ        ; orbinaut enemy
+		plcm	Nem_LzPlatfm,    ArtTile_LZ_Rising_Platform ; rising platform
+		plcm	Nem_Orbinaut,    ArtTile_LZ_Orbinaut        ; orbinaut enemy
 		plcm	Nem_Jaws,        ArtTile_Jaws               ; jaws enemy
 		plcm	Nem_LzSwitch,    ArtTile_Button             ; switch
 		plcm	Nem_Cork,        ArtTile_LZ_Cork            ; cork block
@@ -139,15 +139,15 @@ PLC_LZ2end:
 ; ---------------------------------------------------------------------------
 PLC_MZ:		dc.w ((PLC_MZ2-PLC_MZ-2)/6)-1
 		plcm	Nem_MZ,       ArtTile_Level              ; MZ main patterns
-		plcm	Nem_MzMetal,  ArtTile_Chain_Stomp        ; metal blocks
-		plcm	Nem_MzFire,   ArtTile_Fireball_MZ        ; fireballs
-		plcm	Nem_Swing,    ArtTile_Swing_GHZ_MZ       ; swinging platform
-		plcm	Nem_MzGlass,  ArtTile_Glass_Block        ; green glassy block
+		plcm	Nem_MzMetal,  ArtTile_MZ_Spike_Stomper   ; metal blocks
+		plcm	Nem_MzFire,   ArtTile_MZ_Fireball        ; fireballs
+		plcm	Nem_Swing,    ArtTile_GHZ_MZ_Swing       ; swinging platform
+		plcm	Nem_MzGlass,  ArtTile_MZ_Glass_Pillar    ; green glassy block
 		plcm	Nem_Lava,     ArtTile_MZ_Lava            ; lava
 		plcm	Nem_Buzz,     ArtTile_Buzz_Bomber        ; buzz bomber enemy
 		plcm	Nem_Yadrin,   ArtTile_Yadrin             ; yadrin enemy
 		plcm	Nem_Basaran,  ArtTile_Basaran            ; basaran enemy
-		plcm	Nem_Cater,    ArtTile_Caterkiller_MZ_SYZ ; caterkiller enemy
+		plcm	Nem_Cater,    ArtTile_MZ_SYZ_Caterkiller ; caterkiller enemy
 
 PLC_MZ2:	dc.w ((PLC_MZ2end-PLC_MZ2-2)/6)-1
 		plcm	Nem_MzSwitch, ArtTile_Button+4           ; switch
@@ -160,23 +160,23 @@ PLC_MZ2end:
 ; Pattern load cues - Star Light
 ; ---------------------------------------------------------------------------
 PLC_SLZ:	dc.w ((PLC_SLZ2-PLC_SLZ-2)/6)-1
-		plcm	Nem_SLZ,       ArtTile_Level                ; SLZ main patterns
-		plcm	Nem_Bomb,      ArtTile_Bomb                 ; bomb enemy
-		plcm	Nem_Orbinaut,  ArtTile_Orbinaut_SLZ_SBZ     ; orbinaut enemy
-		plcm	Nem_MzFire,    ArtTile_Fireball_SLZ         ; fireballs
-		plcm	Nem_SlzBlock,  ArtTile_Collapsing_Floor_SLZ ; block
-		plcm	Nem_SlzWall,   ArtTile_Smashable_Wall+4     ; breakable wall
-		plcm	Nem_Spikes,    ArtTile_Spikes               ; spikes
-		plcm	Nem_HSpring,   ArtTile_Spring_Horizontal    ; horizontal spring
-		plcm	Nem_VSpring,   ArtTile_Spring_Vertical      ; vertical spring
+		plcm	Nem_SLZ,       ArtTile_Level                    ; SLZ main patterns
+		plcm	Nem_Bomb,      ArtTile_Bomb                     ; bomb enemy
+		plcm	Nem_Orbinaut,  ArtTile_SLZ_Orbinaut             ; orbinaut enemy
+		plcm	Nem_MzFire,    ArtTile_SLZ_Fireball             ; fireballs
+		plcm	Nem_SlzBlock,  ArtTile_SLZ_Collapsing_Floor     ; block
+		plcm	Nem_SlzWall,   ArtTile_GHZ_SLZ_Smashable_Wall+4 ; breakable wall
+		plcm	Nem_Spikes,    ArtTile_Spikes                   ; spikes
+		plcm	Nem_HSpring,   ArtTile_Spring_Horizontal        ; horizontal spring
+		plcm	Nem_VSpring,   ArtTile_Spring_Vertical          ; vertical spring
 
 PLC_SLZ2:	dc.w ((PLC_SLZ2end-PLC_SLZ2-2)/6)-1
-		plcm	Nem_Seesaw,    ArtTile_Seesaw               ; seesaw
-		plcm	Nem_Fan,       ArtTile_Fan                  ; fan
-		plcm	Nem_Pylon,     ArtTile_Pylon                ; foreground pylon
-		plcm	Nem_SlzSwing,  ArtTile_Swing_SLZ            ; swinging platform
-		plcm	Nem_SlzCannon, ArtTile_Fireball_Launcher    ; fireball launcher
-		plcm	Nem_SlzSpike,  ArtTile_Spikeball            ; spikeball
+		plcm	Nem_Seesaw,    ArtTile_SLZ_Seesaw                ; seesaw
+		plcm	Nem_Fan,       ArtTile_SLZ_Fan                   ; fan
+		plcm	Nem_Pylon,     ArtTile_SLZ_Pylon                 ; foreground pylon
+		plcm	Nem_SlzSwing,  ArtTile_SLZ_Swing                 ; swinging platform
+		plcm	Nem_SlzCannon, ArtTile_SLZ_Fireball_Launcher     ; fireball launcher
+		plcm	Nem_SlzSpike,  ArtTile_SLZ_Spikeball             ; spikeball
 PLC_SLZ2end:
 ; ---------------------------------------------------------------------------
 ; Pattern load cues - Spring Yard
@@ -189,10 +189,10 @@ PLC_SYZ:	dc.w ((PLC_SYZ2-PLC_SYZ-2)/6)-1
 		plcm	Nem_Roller,    ArtTile_Roller              ; roller enemy
 
 PLC_SYZ2:	dc.w ((PLC_SYZ2end-PLC_SYZ2-2)/6)-1
-		plcm	Nem_Bumper,    ArtTile_Bumper              ; bumper
-		plcm	Nem_SyzSpike1, ArtTile_Big_Spikeball       ; large spikeball
-		plcm	Nem_SyzSpike2, ArtTile_Spikeball_Chain_SLZ ; small spikeball
-		plcm	Nem_Cater,     ArtTile_Caterkiller_MZ_SYZ  ; caterkiller enemy
+		plcm	Nem_Bumper,    ArtTile_SYZ_Bumper          ; bumper
+		plcm	Nem_SyzSpike1, ArtTile_SYZ_Big_Spikeball   ; large spikeball
+		plcm	Nem_SyzSpike2, ArtTile_SLZ_Spikeball_Chain ; small spikeball
+		plcm	Nem_Cater,     ArtTile_MZ_SYZ_Caterkiller  ; caterkiller enemy
 		plcm	Nem_LzSwitch,  ArtTile_Button              ; switch
 		plcm	Nem_Spikes,    ArtTile_Spikes              ; spikes
 		plcm	Nem_HSpring,   ArtTile_Spring_Horizontal   ; horizontal spring
@@ -203,27 +203,27 @@ PLC_SYZ2end:
 ; ---------------------------------------------------------------------------
 PLC_SBZ:	dc.w ((PLC_SBZ2-PLC_SBZ-2)/6)-1
 		plcm	Nem_SBZ,       ArtTile_Level                   ; SBZ main patterns
-		plcm	Nem_Stomper,   ArtTile_Moving_Block_SBZ_Short  ; moving platform and stomper
+		plcm	Nem_Stomper,   ArtTile_SBZ_Moving_Block_Short  ; moving platform and stomper
 		plcm	Nem_SbzDoor1,  ArtTile_SBZ_Door                ; door
-		plcm	Nem_Girder,    ArtTile_Girder                  ; girder
+		plcm	Nem_Girder,    ArtTile_SBZ_Girder              ; girder
 		plcm	Nem_BallHog,   ArtTile_Ball_Hog                ; ball hog enemy
 		plcm	Nem_SbzWheel1, ArtTile_SBZ_Disc                ; spot on large wheel
 		plcm	Nem_SbzWheel2, ArtTile_SBZ_Junction            ; wheel that grabs Sonic
-		plcm	Nem_SyzSpike1, ArtTile_Swing_SBZ               ; large spikeball
-		plcm	Nem_Cutter,    ArtTile_Saw                     ; pizza cutter
-		plcm	Nem_FlamePipe, ArtTile_Flamethrower            ; flaming pipe
-		plcm	Nem_SbzFloor,  ArtTile_Collapsing_Floor_SBZ    ; collapsing floor
+		plcm	Nem_SyzSpike1, ArtTile_SBZ_Swing               ; large spikeball
+		plcm	Nem_Cutter,    ArtTile_SBZ_Saw                 ; pizza cutter
+		plcm	Nem_FlamePipe, ArtTile_SBZ_Flamethrower        ; flaming pipe
+		plcm	Nem_SbzFloor,  ArtTile_SBZ_Collapsing_Floor    ; collapsing floor
 		plcm	Nem_SbzBlock,  ArtTile_SBZ_Vanishing_Block     ; vanishing block
 
 PLC_SBZ2:	dc.w ((PLC_SBZ2end-PLC_SBZ2-2)/6)-1
-		plcm	Nem_Cater,      ArtTile_Caterkiller_SBZ        ; caterkiller enemy
+		plcm	Nem_Cater,      ArtTile_SBZ_Caterkiller        ; caterkiller enemy
 		plcm	Nem_Bomb,       ArtTile_Bomb                   ; bomb enemy
-		plcm	Nem_Orbinaut,   ArtTile_Orbinaut_SLZ_SBZ       ; orbinaut enemy
-		plcm	Nem_SlideFloor, ArtTile_Moving_Block_SBZ_Long  ; floor that slides away
+		plcm	Nem_Orbinaut,   ArtTile_SBZ_Orbinaut           ; orbinaut enemy
+		plcm	Nem_SlideFloor, ArtTile_SBZ_Moving_Block_Long  ; floor that slides away
 		plcm	Nem_SbzDoor2,   ArtTile_SBZ_Horizontal_Door    ; horizontal door
-		plcm	Nem_Electric,   ArtTile_Electric_Orb           ; electric orb
+		plcm	Nem_Electric,   ArtTile_SBZ_Electric_Orb       ; electric orb
 		plcm	Nem_TrapDoor,   ArtTile_SBZ_Trap_Door          ; trapdoor
-		plcm	Nem_SbzFloor,   ArtTile_Collapsing_Floor_SBZ+4 ; collapsing floor
+		plcm	Nem_SbzFloor,   ArtTile_SBZ_Collapsing_Floor+4 ; collapsing floor
 		plcm	Nem_SpinPform,  ArtTile_SBZ_Spinning_Platform  ; small spinning platform
 		plcm	Nem_LzSwitch,   ArtTile_Button                 ; switch
 		plcm	Nem_Spikes,     ArtTile_Spikes                 ; spikes
@@ -381,11 +381,11 @@ PLC_EggmanSBZ2end:
 ; Pattern load cues - final boss
 ; ---------------------------------------------------------------------------
 PLC_FZBoss:	dc.w ((PLC_FZBossend-PLC_FZBoss-2)/6)-1
-		plcm	Nem_FzEggman,   ArtTile_FZ_Eggman_Fleeing      ; Eggman after boss
-		plcm	Nem_FzBoss,     ArtTile_FZ_Boss                ; FZ boss
-		plcm	Nem_Eggman,     ArtTile_Eggman                 ; Eggman main patterns
-		plcm	Nem_Sbz2Eggman, ArtTile_Eggman_Outside_Vehicle ; Eggman without ship
-		plcm	Nem_Exhaust,    ArtTile_Eggman_Exhaust         ; exhaust flame
+		plcm	Nem_FzEggman,   ArtTile_FZ_Eggman_Fleeing    ; Eggman after boss
+		plcm	Nem_FzBoss,     ArtTile_FZ_Boss              ; FZ boss
+		plcm	Nem_Eggman,     ArtTile_Eggman               ; Eggman main patterns
+		plcm	Nem_Sbz2Eggman, ArtTile_FZ_Eggman_No_Vehicle ; Eggman without ship
+		plcm	Nem_Exhaust,    ArtTile_Eggman_Exhaust       ; exhaust flame
 PLC_FZBossend:
 
 ; ---------------------------------------------------------------------------