Detailing alternate ring mappings

sonicretro · Jun 6, 2015 · 949e67b · 949e67b
1 parent 8107495
commit 949e67b
Showing 1 changed file with 58 additions and 17 deletions.
diff --git a/sonic3k.asm b/sonic3k.asm
@@ -18729,7 +18729,7 @@ sub_EB86:
 		sub.l	a0,d2
 		beq.s	locret_EBEC
 		movea.w	(Ring_start_addr_RAM).w,a4
-		lea	word_EBEE(pc),a1
+		lea	CMap_Ring(pc),a1
 		move.w	4(a3),d4
 		move.w	#$F0,d5
 		move.w	(Screen_Y_wrap_value).w,d3
@@ -18774,22 +18774,63 @@ locret_EBEC:
 ; End of function sub_EB86
 
 ; ---------------------------------------------------------------------------
-word_EBEE:	dc.w  $FFF8,	 5
-		dc.w  $26BC, $FFF8
-		dc.w  $FFF8,	 5
-		dc.w  $26C0, $FFF8
-		dc.w  $FFF8,	 1
-		dc.w  $26C4, $FFFC
-		dc.w  $FFF8,	 5
-		dc.w  $2EC0, $FFF8
-		dc.w  $FFF8,	 5
-		dc.w  $26C6, $FFF8
-		dc.w  $FFF8,	 5
-		dc.w  $3EC6, $FFF8
-		dc.w  $FFF8,	 5
-		dc.w  $2EC6, $FFF8
-		dc.w  $FFF8,	 5
-		dc.w  $36C6, $FFF8
+; Custom mappings format. Compare to Map_Ring.
+
+; Differences include...
+;  No offset table (each sprite assumed to be 8 bytes)
+;  No 'sprite pieces per frame' value (hardcoded to 1)
+;  Sign-extended Y-pos value
+;  Sign-extended sprite size value
+; word_EBEE:
+CMap_Ring:
+
+;frame1:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$0000+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame2:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$0004+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame3:
+	dc.w	$FFF8
+	dc.w	$0001
+	dc.w	$0008+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFFC
+
+;frame4:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$0804+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame5:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$000A+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame6:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$180A+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame7:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$080A+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
+
+;frame8:
+	dc.w	$FFF8
+	dc.w	$0005
+	dc.w	$100A+make_art_tile(ArtTile_ArtNem_Ring,1,0)
+	dc.w	$FFF8
 
 ; =============== S U B R O U T I N E =======================================