art edits

DrMelon · Dec 19, 2019 · c2405e1 · c2405e1
1 parent 01d1066
commit c2405e1
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 5 deletions.
diff --git a/art/nemesis/HUD.bin b/art/nemesis/HUD.bin
diff --git a/art/nemesis/Main patterns from title screen.bin b/art/nemesis/Main patterns from title screen.bin
diff --git a/art/nemesis/Signpost.bin b/art/nemesis/Signpost.bin
diff --git a/art/nemesis/Sonic and Tails from title screen.bin b/art/nemesis/Sonic and Tails from title screen.bin
diff --git a/art/nemesis/hud_ring.bmp b/art/nemesis/hud_ring.bmp
diff --git a/art/nemesis/signpost_sonk.bmp b/art/nemesis/signpost_sonk.bmp
diff --git a/art/nemesis/sonic_2_logo.bmp b/art/nemesis/sonic_2_logo.bmp
diff --git a/art/nemesis/sonic_2_logo_other.bmp b/art/nemesis/sonic_2_logo_other.bmp
diff --git a/art/nemesis/tmp.asm b/art/nemesis/tmp.asm
@@ -0,0 +1,45 @@
+; --------------------------------------------------------------------------------
+; Sprite mappings - output from SonMapEd - Sonic 2 format
+; --------------------------------------------------------------------------------
+
+SME_hu_kd:	
+		dc.w SME_hu_kd_2-SME_hu_kd	
+SME_hu_kd_2:	dc.b 0, $25	
+		dc.b $E0, $C, 0, $A9, 0, $54, $FF, $F8	
+		dc.b $E0, $C, 0, $AD, 0, $56, 0, $18	
+		dc.b $E0, $C, 0, $B1, 0, $58, 0, $38	
+		dc.b $E0, $C, 0, $B5, 0, $5A, 0, $58	
+		dc.b $E0, $C, 0, $B9, 0, $5C, 0, $78	
+		dc.b $E0, 0, 0, $BD, 0, $5E, 0, $98	
+		dc.b $E8, $C, 0, $BE, 0, $5F, 0, 0	
+		dc.b $E8, $C, 0, $C2, 0, $61, 0, $20	
+		dc.b $E8, $C, 0, $C6, 0, $63, 0, $40	
+		dc.b $E8, $C, 0, $CA, 0, $65, 0, $60	
+		dc.b $E8, $C, 0, $CE, 0, $67, 0, $80	
+		dc.b $F0, $C, 0, $D2, 0, $69, 0, 8	
+		dc.b $F0, $C, 0, $D6, 0, $6B, 0, $28	
+		dc.b $F0, $C, 0, $DA, 0, $6D, 0, $48	
+		dc.b $F0, $C, 0, $DE, 0, $6F, 0, $68	
+		dc.b $F0, $C, 0, $E2, 0, $71, 0, $88	
+		dc.b $F8, $C, 0, $E6, 0, $73, 0, $10	
+		dc.b $F8, $C, 0, $EA, 0, $75, 0, $30	
+		dc.b $F8, $C, 0, $EE, 0, $77, 0, $50	
+		dc.b $F8, $C, 0, $F2, 0, $79, 0, $70	
+		dc.b $F8, $C, 0, $F6, 0, $7B, 0, $90	
+		dc.b 0, $C, 0, $FB, 0, $7D, 0, 8	
+		dc.b 0, $C, 0, $FF, 0, $7F, 0, $28	
+		dc.b 0, $C, 1, 3, 1, $81, 0, $48	
+		dc.b 0, $C, 1, 7, 1, $83, 0, $68	
+		dc.b 0, $C, 1, $B, 1, $85, 0, $88	
+		dc.b 8, $C, 1, $16, 1, $8B, 0, $28	
+		dc.b 8, $C, 1, $1A, 1, $8D, 0, $48	
+		dc.b 8, $C, 1, $1E, 1, $8F, 0, $68	
+		dc.b $10, $C, 1, $27, 1, $93, 0, $40	
+		dc.b $10, 4, 1, $2B, 1, $95, 0, $60	
+		dc.b $18, $C, 1, $34, 1, $9A, 0, $40	
+		dc.b $18, 4, 1, $38, 1, $9C, 0, $60	
+		dc.b $20, $C, 1, $3E, 1, $9F, 0, $40	
+		dc.b $20, 4, 1, $42, 1, $A1, 0, $60	
+		dc.b $28, $C, 1, $46, 1, $A3, 0, $40	
+		dc.b $28, 4, 1, $4A, 1, $A5, 0, $60	
+		even
diff --git a/art/nemesis/topbanner.bmp b/art/nemesis/topbanner.bmp
diff --git a/s2.asm b/s2.asm
@@ -23515,16 +23515,25 @@ ObjDD_Main:
 	;; H-BAR; test if not in strike or in y-mode & delete self if so.
 
 	; set pos to orig spawn pos + hbar offset? hbar should probably only display...
-	move.w	(Golf_bar_posx).w,x_pos(a0)
-	move.w	(Golf_bar_posy).w,y_pos(a0)
-	subi.w	#32,y_pos(a0) ; move above sonic a little
+
 
 	btst	#0,(Golf_mode_status).w ; test on/off strike mode
 	beq.w	DeleteObject		; if it's not in strke mode, delete self
 	btst 	#1,(Golf_mode_status).w ; test X/Y status.
-	bne.w	DeleteObject		; if it's in Y mode, delete self.
-	bra.w	DisplaySprite
+	bne.w	GolfMeterYMode		; if it's in Y mode
+
 
+	;; display Horizontal
+	move.w	(Golf_bar_posx).w,x_pos(a0)
+	move.w	(Golf_bar_posy).w,y_pos(a0)
+	subi.w	#32,y_pos(a0) ; move above sonic a little
+	bra.w	DisplaySprite
+GolfMeterYMode:
+	;; display Vertical
+	move.w	(Golf_bar_posx).w,x_pos(a0)
+	move.w	(Golf_bar_posy).w,y_pos(a0)
+	subi.w	#16,y_pos(a0) ; move above sonic a little
+	bra.w	DisplaySprite
 
 ; ===========================================================================
 ; ----------------------------------------------------------------------------