Seamless chains

Author: dmitry-shechtman

art/judge/judge_back.png

@@ -60,7 +60,7 @@ DEF Y_FEATHER_5    EQU  Y_FEATHER_0 + 3
 DEF Y_FEATHER_6    EQU  Y_FEATHER_0 + 2
 DEF Y_FEATHER_7    EQU  Y_FEATHER_0 + 1
 
-DEF H_CHAIN_LEFT   EQU   5
+DEF H_CHAIN_LEFT   EQU   6
 DEF X_CHAIN_LEFT   EQU  32
 FOR I, 8
 	DEF Y_CHAIN_LEFT_{d:I}  EQU Y_SOUL_{d:I} - 8 * H_CHAIN_LEFT
@@ -69,7 +69,7 @@ ENDR
 DEF H_CHAIN_RIGHT  EQU   4
 DEF X_CHAIN_RIGHT  EQU  88
 FOR I, 8
-	DEF Y_CHAIN_RIGHT_{d:I} EQU Y_SOUL_0 - Y_SOUL_{d:I} + 88 - 8 * H_CHAIN_RIGHT
+	DEF Y_CHAIN_RIGHT_{d:I} EQU Y_SOUL_0 - Y_SOUL_{d:I} + 70 - 8 * H_CHAIN_RIGHT
 ENDR
 
 DEF W_PLATE        EQU   5
@@ -78,7 +78,11 @@ DEF O_CHAIN_LEFT   EQU O_FEATHER      + H_FEATHER
 DEF O_STRING_LEFT  EQU O_CHAIN_LEFT   + H_CHAIN_LEFT
 DEF O_PLATE_LEFT   EQU O_STRING_LEFT  + 4
 
-DEF O_CHAIN_RIGHT  EQU O_PLATE_LEFT   + W_PLATE
+DEF O_CHAIN_RIGHT2 EQU O_PLATE_LEFT   + W_PLATE
+DEF H_CHAIN_RIGHT2 EQU   2
+DEF DX_CHAIN_RIGHT EQU  10
+
+DEF O_CHAIN_RIGHT  EQU O_CHAIN_RIGHT2 + H_CHAIN_RIGHT2
 DEF O_STRING_RIGHT EQU O_CHAIN_RIGHT  + H_CHAIN_RIGHT
 DEF O_PLATE_RIGHT  EQU O_STRING_RIGHT + 4
 
@@ -112,9 +116,15 @@ DEF MAP_HEALTH     EQU  TILEMAP1
 DEF ROW_HEALTH     EQU   0
 DEF COL_HEALTH     EQU  16
 
-DEF T_TOP_LEFT     EQU $AF
+DEF T_TOP_LEFT1    EQU $AE
+DEF T_TOP_LEFT2    EQU T_TOP_LEFT1 + 1
+DEF T_TOP_RIGHT    EQU T_TOP_LEFT2 + 1
+
 DEF COL_TOP_LEFT   EQU   3
-DEF ROW_TOP_LEFT   EQU   5
+DEF ROW_TOP_LEFT   EQU   4
+
+DEF COL_TOP_RIGHT  EQU  10
+DEF ROW_TOP_RIGHT  EQU   2
 
 DEF MUSIC_DELAY    EQU $40
 DEF MUSIC_STEREO   EQU   1

art/judge/judge_top.png

@@ -21,6 +21,7 @@ Judge::
 	ld bc, Back2Tiles.end - Back2Tiles
 	call Copy1bppLongSafe
 
+	ld b, BackTiles.end - BackTiles
 	call Copy2bppSafe
 
 	ld hl, STARTOF(VRAM) | $1000
@@ -74,8 +75,14 @@ Judge::
 	call SetAdjObject
 
 .right
-	ld a, H_CHAIN_RIGHT - 1
+	ld bc, T_CHAIN << 8 | OAM_PRIO | OAM_YFLIP
 	ld de, Y_CHAIN_RIGHT_0 << 8 | X_CHAIN_RIGHT
+	call SetObject
+	ld d, Y_CHAIN_RIGHT_0 + TILE_HEIGHT
+	call SetObject
+
+	ld a, H_CHAIN_RIGHT - 1
+	ld de, (Y_CHAIN_RIGHT_0 + TILE_HEIGHT + DX_CHAIN_RIGHT) << 8 | X_CHAIN_RIGHT
 	call InitChain
 	ld b, T_STRING
 	call InitString
@@ -107,7 +114,6 @@ Copy1bppLongSafe:
 
 SECTION "Copy2bppSafe", ROM0
 Copy2bppSafe:
-	ld b, TILE_SIZE
 .loop
 	rst WaitVRAM               ; Wait for VRAM to become accessible
 	ld a, [de]                 ; Load a byte from the address DE points to into the A register
@@ -246,9 +252,13 @@ Back1Tiles:
 .end
 
 BackMap:
-	INCBIN "judge_back.tilemap", 0, ROW_TOP_LEFT * SCREEN_WIDTH + COL_TOP_LEFT
-	db T_TOP_LEFT
-	INCBIN "judge_back.tilemap", ROW_TOP_LEFT * SCREEN_WIDTH + COL_TOP_LEFT + 1
+	INCBIN "judge_back.tilemap", 0, ROW_TOP_RIGHT * SCREEN_WIDTH + COL_TOP_RIGHT
+	db T_TOP_RIGHT
+	INCBIN "judge_back.tilemap", ROW_TOP_RIGHT * SCREEN_WIDTH + COL_TOP_RIGHT + 1, ROW_TOP_LEFT * SCREEN_WIDTH + COL_TOP_LEFT - (ROW_TOP_RIGHT * SCREEN_WIDTH + COL_TOP_RIGHT + 1)
+	db T_TOP_LEFT1
+	INCBIN "judge_back.tilemap", ROW_TOP_LEFT * SCREEN_WIDTH + COL_TOP_LEFT + 1, SCREEN_WIDTH - 1
+	db T_TOP_LEFT2
+	INCBIN "judge_back.tilemap", (ROW_TOP_LEFT + 1) * SCREEN_WIDTH + COL_TOP_LEFT + 1
 .end
 
 StatusMap:

inc/judge.inc

@@ -114,15 +114,11 @@ ENDC
 	call UpdateFeather
 
 .left
-	ld d, H_CHAIN_LEFT
-	call UpdateChain
+	call UpdateSoulChain
 	call UpdateSoulPlate
 
 .right
-	ld d, H_CHAIN_RIGHT
-	call UpdateChain
-	ld d, W_PLATE
-	call UpdateRow
+	call UpdateFeatherChainAndPlate
 
 	call hFixedOAMDMA
 
@@ -189,7 +185,7 @@ UpdateSoulPlate:
 .4
 	ld [hl], d                 ; Set Y
 
-	ld l, O_CHAIN_RIGHT * OBJ_SIZE
+	ld l, O_CHAIN_RIGHT2 * OBJ_SIZE
 	ret
 
 
@@ -278,30 +274,47 @@ UpdateHalf:
 	ret
 
 
-SECTION "UpdateRow", ROM0
-UpdateChain:
-	ld a, [bc]
-	inc c
+SECTION "UpdateChain", ROM0
+UpdateFeatherChainAndPlate:
+	ld d, H_CHAIN_RIGHT2
+	call UpdateChain
+	inc a
+	inc a
+	ld d, H_CHAIN_RIGHT
+	call UpdateChain.loop
+	call UpdateSoulChain.cont
+	ld d, W_PLATE
+	jr UpdateRow
+
+UpdateSoulChain:
+	ld d, H_CHAIN_LEFT
+	call UpdateChain
+.cont
+	ld d, 2
+	call UpdateRow.loop
+	ld d, 2
+	; Fall through
+
+UpdateRow:
+	add TILE_HEIGHT
 .loop
 	ld [hli], a
 REPT OBJ_SIZE - 1
 	inc l
 ENDR
-	add TILE_HEIGHT
 	dec d
 	jr nz, .loop
-	ld d, 2
-	call UpdateRow.loop
-	ld d, 2
-	; Fall through
+	ret
 
-UpdateRow:
-	add TILE_HEIGHT
+UpdateChain:
+	ld a, [bc]
+	inc c
 .loop
 	ld [hli], a
 REPT OBJ_SIZE - 1
 	inc l
 ENDR
+	add TILE_HEIGHT
 	dec d
 	jr nz, .loop
 	ret