zonewarning no longer accounts for hackishly-implemented Ending zone

Fixes #8

10 files changed, 16 insertions, 15 deletions

diff --git a/_inc/AnimateLevelGfx.asm b/_inc/AnimateLevelGfx.asm
index df21709..4ae759c 100644
--- a/_inc/AnimateLevelGfx.asm
+++ b/_inc/AnimateLevelGfx.asm
@@ -23,8 +23,8 @@ AnimateLevelGfx:
 AniArt_Index:	dc.w AniArt_GHZ-AniArt_Index, AniArt_none-AniArt_Index
 		dc.w AniArt_MZ-AniArt_Index, AniArt_none-AniArt_Index
 		dc.w AniArt_none-AniArt_Index, AniArt_SBZ-AniArt_Index
-		dc.w AniArt_Ending-AniArt_Index
 		zonewarning AniArt_Index,2
+		dc.w AniArt_Ending-AniArt_Index
 ; ===========================================================================
 ; ---------------------------------------------------------------------------
 ; Animated pattern routine - Green Hill
diff --git a/_inc/DebugList.asm b/_inc/DebugList.asm
index 8fa70f8..4f1c626 100644
--- a/_inc/DebugList.asm
+++ b/_inc/DebugList.asm
@@ -8,8 +8,8 @@ DebugList:
 	dc.w @SLZ-DebugList
 	dc.w @SYZ-DebugList
 	dc.w @SBZ-DebugList
-	dc.w @Ending-DebugList
 	zonewarning DebugList,2
+	dc.w @Ending-DebugList
 
 dbug:	macro map,object,subtype,frame,vram
 	dc.l map+(object<<24)
diff --git a/_inc/DeformLayers.asm b/_inc/DeformLayers.asm
index 69ffda0..9de5b23 100644
--- a/_inc/DeformLayers.asm
+++ b/_inc/DeformLayers.asm
@@ -39,8 +39,8 @@ loc_628E:
 Deform_Index:	dc.w Deform_GHZ-Deform_Index, Deform_LZ-Deform_Index
 		dc.w Deform_MZ-Deform_Index, Deform_SLZ-Deform_Index
 		dc.w Deform_SYZ-Deform_Index, Deform_SBZ-Deform_Index
-		dc.w Deform_GHZ-Deform_Index
 		zonewarning Deform_Index,2
+		dc.w Deform_GHZ-Deform_Index
 ; ---------------------------------------------------------------------------
 ; Green	Hill Zone background layer deformation code
 ; ---------------------------------------------------------------------------
diff --git a/_inc/DynamicLevelEvents.asm b/_inc/DynamicLevelEvents.asm
index 60cd486..7b5530a 100644
--- a/_inc/DynamicLevelEvents.asm
+++ b/_inc/DynamicLevelEvents.asm
@@ -55,8 +55,8 @@ loc_6DC4:
 DLE_Index:	dc.w DLE_GHZ-DLE_Index, DLE_LZ-DLE_Index
 		dc.w DLE_MZ-DLE_Index, DLE_SLZ-DLE_Index
 		dc.w DLE_SYZ-DLE_Index, DLE_SBZ-DLE_Index
-		dc.w DLE_Ending-DLE_Index
 		zonewarning DLE_Index,2
+		dc.w DLE_Ending-DLE_Index
 ; ===========================================================================
 ; ---------------------------------------------------------------------------
 ; Green	Hill Zone dynamic level events
diff --git a/_inc/LevelHeaders.asm b/_inc/LevelHeaders.asm
index 3f32ab7..be5f108 100644
--- a/_inc/LevelHeaders.asm
+++ b/_inc/LevelHeaders.asm
@@ -23,8 +23,8 @@ lhead:	macro plc1,lvlgfx,plc2,sixteen,twofivesix,music,pal
 	lhead	plcid_SLZ,	Nem_SLZ,	plcid_SLZ2,	Blk16_SLZ,	Blk256_SLZ,	bgm_SLZ,	palid_SLZ	; Star Light
 	lhead	plcid_SYZ,	Nem_SYZ,	plcid_SYZ2,	Blk16_SYZ,	Blk256_SYZ,	bgm_SYZ,	palid_SYZ	; Spring Yard
 	lhead	plcid_SBZ,	Nem_SBZ,	plcid_SBZ2,	Blk16_SBZ,	Blk256_SBZ,	bgm_SBZ,	palid_SBZ1	; Scrap Brain
-	lhead	0,		Nem_GHZ_2nd,	0,		Blk16_GHZ,	Blk256_GHZ,	bgm_SBZ,	palid_Ending	; Ending
 	zonewarning LevelHeaders,$10
+	lhead	0,		Nem_GHZ_2nd,	0,		Blk16_GHZ,	Blk256_GHZ,	bgm_SBZ,	palid_Ending	; Ending
 	even
 
 ;	* music and level gfx are actually set elsewhere, so these values are useless
\ No newline at end of file
diff --git a/_inc/LevelSizeLoad & BgScrollSpeed.asm b/_inc/LevelSizeLoad & BgScrollSpeed.asm
index 655d78a..d69be36 100644
--- a/_inc/LevelSizeLoad & BgScrollSpeed.asm
+++ b/_inc/LevelSizeLoad & BgScrollSpeed.asm
@@ -69,12 +69,12 @@ LevelSizeArray:
 		dc.w $0004, $0000, $1E40, $FF00, $0800, $0060
 		dc.w $0004, $2080, $2460, $0510, $0510, $0060
 		dc.w $0004, $0000, $3EC0, $0000, $0720, $0060
+		zonewarning LevelSizeArray,$30
 		; Ending
 		dc.w $0004, $0000, $0500, $0110, $0110, $0060
 		dc.w $0004, $0000, $0DC0, $0110, $0110, $0060
 		dc.w $0004, $0000, $2FFF, $0000, $0320, $0060
 		dc.w $0004, $0000, $2FFF, $0000, $0320, $0060
-		zonewarning LevelSizeArray,$30
 
 ; ---------------------------------------------------------------------------
 ; Ending start location array
@@ -167,8 +167,8 @@ LoopTileNums:
 	dc.b	$AA,	$B4,	$7F,	$7F	; Star Light
 	dc.b	$7F,	$7F,	$7F,	$7F	; Spring Yard
 	dc.b	$7F,	$7F,	$7F,	$7F	; Scrap Brain
-	dc.b	$7F,	$7F,	$7F,	$7F	; Ending (Green Hill)
 	zonewarning LoopTileNums,4
+	dc.b	$7F,	$7F,	$7F,	$7F	; Ending (Green Hill)
 
 		even
 
@@ -192,8 +192,8 @@ dword_61B4:	dc.l $700100, $1000100
 		dc.l $8000100, $1000000
 		dc.l $8000100, $1000000
 		dc.l $8000100, $1000000
-		dc.l $700100, $1000100
 		zonewarning dword_61B4,8
+		dc.l $700100, $1000100
 
 ; ---------------------------------------------------------------------------
 ; Subroutine to	set scroll speed of some backgrounds
@@ -223,8 +223,8 @@ loc_6206:
 BgScroll_Index:	dc.w BgScroll_GHZ-BgScroll_Index, BgScroll_LZ-BgScroll_Index
 		dc.w BgScroll_MZ-BgScroll_Index, BgScroll_SLZ-BgScroll_Index
 		dc.w BgScroll_SYZ-BgScroll_Index, BgScroll_SBZ-BgScroll_Index
-		dc.w BgScroll_End-BgScroll_Index
 		zonewarning BgScroll_Index,2
+		dc.w BgScroll_End-BgScroll_Index
 ; ===========================================================================
 
 BgScroll_GHZ:
diff --git a/_inc/Palette Pointers.asm b/_inc/Palette Pointers.asm
index 19e3ab4..5bee8cf 100644
--- a/_inc/Palette Pointers.asm
+++ b/_inc/Palette Pointers.asm
@@ -22,7 +22,7 @@ ptr_Pal_MZ:		palp	Pal_MZ,v_pal_dry+$20,$30		; 6 - MZ
 ptr_Pal_SLZ:		palp	Pal_SLZ,v_pal_dry+$20,$30		; 7 - SLZ
 ptr_Pal_SYZ:		palp	Pal_SYZ,v_pal_dry+$20,$30		; 8 - SYZ
 ptr_Pal_SBZ1:		palp	Pal_SBZ1,v_pal_dry+$20,$30		; 9 - SBZ1
-			zonewarningnoending Pal_Levels,8
+			zonewarning Pal_Levels,8
 ptr_Pal_Special:	palp	Pal_Special,v_pal_dry,$40		; $A (10) - special stage
 ptr_Pal_LZWater:	palp	Pal_LZWater,v_pal_dry,$40		; $B (11) - LZ underwater
 ptr_Pal_SBZ3:		palp	Pal_SBZ3,v_pal_dry+$20,$30		; $C (12) - SBZ3
diff --git a/_inc/PaletteCycle.asm b/_inc/PaletteCycle.asm
index e0ba3ee..6b35b2b 100644
--- a/_inc/PaletteCycle.asm
+++ b/_inc/PaletteCycle.asm
@@ -24,9 +24,9 @@ PCycle_Index:	dc.w PCycle_GHZ-PCycle_Index
 		dc.w PalCycle_SLZ-PCycle_Index
 		dc.w PalCycle_SYZ-PCycle_Index
 		dc.w PalCycle_SBZ-PCycle_Index
-		dc.w PCycle_GHZ-PCycle_Index
-
 		zonewarning PCycle_Index,2
+		dc.w PCycle_GHZ-PCycle_Index	; Ending
+
 
 ; ||||||||||||||| S U B	R O U T	I N E |||||||||||||||||||||||||||||||||||||||
 
diff --git a/_inc/Pattern Load Cues.asm b/_inc/Pattern Load Cues.asm
index 886df92..884184f 100644
--- a/_inc/Pattern Load Cues.asm
+++ b/_inc/Pattern Load Cues.asm
@@ -20,7 +20,7 @@ ptr_PLC_SYZ:		dc.w PLC_SYZ-ArtLoadCues
 ptr_PLC_SYZ2:		dc.w PLC_SYZ2-ArtLoadCues
 ptr_PLC_SBZ:		dc.w PLC_SBZ-ArtLoadCues
 ptr_PLC_SBZ2:		dc.w PLC_SBZ2-ArtLoadCues
-			zonewarningnoending PLC_Levels,4
+			zonewarning PLC_Levels,4
 ptr_PLC_TitleCard:	dc.w PLC_TitleCard-ArtLoadCues
 ptr_PLC_Boss:		dc.w PLC_Boss-ArtLoadCues
 ptr_PLC_Signpost:	dc.w PLC_Signpost-ArtLoadCues
@@ -33,7 +33,7 @@ ptr_PLC_MZAnimals:	dc.w PLC_MZAnimals-ArtLoadCues
 ptr_PLC_SLZAnimals:	dc.w PLC_SLZAnimals-ArtLoadCues
 ptr_PLC_SYZAnimals:	dc.w PLC_SYZAnimals-ArtLoadCues
 ptr_PLC_SBZAnimals:	dc.w PLC_SBZAnimals-ArtLoadCues
-			zonewarningnoending PLC_Animals,2
+			zonewarning PLC_Animals,2
 ptr_PLC_SSResult:	dc.w PLC_SSResult-ArtLoadCues
 ptr_PLC_Ending:		dc.w PLC_Ending-ArtLoadCues
 ptr_PLC_TryAgain:	dc.w PLC_TryAgain-ArtLoadCues
diff --git a/_inc/Start Location Array - Levels.asm b/_inc/Start Location Array - Levels.asm
index a613b9b..d16bb48 100644
--- a/_inc/Start Location Array - Levels.asm
+++ b/_inc/Start Location Array - Levels.asm
@@ -32,10 +32,11 @@
 		incbin	"startpos\fz.bin"
 		dc.w	$80,$A8
 
+		zonewarning StartLocArray,$10
+
 		incbin	"startpos\end1.bin"
 		incbin	"startpos\end2.bin"
 		dc.w	$80,$A8
 		dc.w	$80,$A8
 
 		even
-		zonewarning StartLocArray,$10