Fix sprite artifacts

grubbyplaya · Mar 25, 2024 · fd42468 · fd42468
1 parent 3e39c89
commit fd42468
Show file tree

Hide file tree

Showing 20 changed files with 1,096 additions and 1,148 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ![](https://raw.githubusercontent.com/grubbyplaya/Sonic-2-CE/master/s2banner.png)
 
-A currently unfinished port of the Sega Master System version of Sonic 2 to the TI-84+ CE.
+A mostly complete port of the Sega Master System version of Sonic 2 to the TI-84+ CE.
 
-So far, the game assembles into 32 appvars totaling 443 kilobytes in size. Every level works, but there are some image artifacts in some stages.
+The game is 443 kilobytes in size. Make sure that every appvar and the launcher is loaded into archive memory, as the game will crash if any appvar is stored in RAM.
 
 # Controls
 
@@ -20,7 +20,7 @@ Delete - Reset Game
  - [x] Get the codebase to assemble using SPASM
  - [x] Reimplement SMS mappers using appvars
  - [x] Replace original 6bpp palettes with 16bpp approximations
- - [x] Emulate the SMS VDP, rendering, caches, and all (~99% done)
+ - [x] Emulate the SMS VDP, rendering, caches, and all
  - [x] Fix remaining runtime errors
  - [ ] (MID PRIORITY) Get the game running at full speed
  - [ ] (VERY LOW PRIORITY) expand the rendering area to fill the 84+ CE's screen
diff --git a/src/art/sonic/art_ucmp_sonic.bin b/src/art/sonic/art_ucmp_sonic.bin
diff --git a/src/art/sonic/art_ucmp_sonic_mirrored.bin b/src/art/sonic/art_ucmp_sonic_mirrored.bin
diff --git a/src/bin/Sonic2.8xv b/src/bin/Sonic2.8xv
diff --git a/src/bin/bank04.8xv b/src/bin/bank04.8xv
diff --git a/src/bin/bank16.8xv b/src/bin/bank16.8xv
diff --git a/src/bin/bank30.8xv b/src/bin/bank30.8xv
diff --git a/src/bin/bank31.8xv b/src/bin/bank31.8xv
diff --git a/src/bin/sonic2.8xp b/src/bin/sonic2.8xp
diff --git a/src/includes/defines.asm b/src/includes/defines.asm
@@ -6,11 +6,11 @@
 
 
 ; ---------------------------------------------------------
-;  Timing Definitions (based on 60hz display)
+;  Timing Definitions (based on 30hz display)
 ; ---------------------------------------------------------
-#define  Time_1Second              60
-#define  Time_2Seconds             120
-#define  Time_3Seconds             180
+#define  Time_1Second              30
+#define  Time_2Seconds             60
+#define  Time_3Seconds             90
 
 ; ---------------------------------------------------------
 ;  Global Triggers Bitfield

diff --git a/src/includes/player_states.asm b/src/includes/player_states.asm
@@ -1,5 +1,5 @@
 #define	PlayerState_Standing		$01
-#define	PlayerState_Idle			$02	;idle animation
+#define	PlayerState_Idle		$02	;idle animation
 #define	PlayerState_LookUp		$03
 #define	PlayerState_Crouch		$04
 #define	PlayerState_Walking		$05
@@ -25,7 +25,7 @@
 #define	PlayerState_JumpFromRamp	$1B	;e.g. in UGZ-3 before boss & when exiting SEZ/ALZ tube
 #define	PlayerState_DiagonalSpring	$1C	;set after collision with diagonal spring
 #define	PlayerState_FallFromLoop	$1D	;set if a player falls from loop (not moving fast enough).
-#define	PlayerState_Hurt			$1E
+#define	PlayerState_Hurt		$1E
 #define	PlayerState_LostLife		$1F
 #define	PlayerState_EndOfLevel		$20	;Set at end of level. CPU controlled movement off of screen.
 #define	PlayerState_InPipe		$21	;Set in ALZ/SEZ on entering a pipe.

diff --git a/src/includes/ti_equates.asm b/src/includes/ti_equates.asm
@@ -18,6 +18,7 @@
 #define SegaTileCache		pixelShadow
 #define VRAM 			$D40000
 #define VRAMEnd			VRAM+((320*240)*2)
+#define mpLcdTiming1		$E30004
 #define mpLcdCtrl		$E30018
 #define mpLcdImsc		$E3001C
 #define mpLcdRis		$E30020

diff --git a/src/layout/ghz/layout_ghz3.bin b/src/layout/ghz/layout_ghz3.bin
diff --git a/src/level_select.asm b/src/level_select.asm
@@ -327,7 +327,9 @@ LevelSelect_Values:
 .db $06, $02	;Crystal Egg Zone - Act 3
 
 LevelSelect_MainLoop:	;0E46
-	call	Engine_WaitForInterrupt
+	ei
+	halt
+	di
 	call	_CheckInput
 	call	_DrawCursor
 	ld	a, (Engine_InputFlags)

diff --git a/src/object_logic/bank30_logic.asm b/src/object_logic/bank30_logic.asm
@@ -1417,7 +1417,7 @@ LABEL_B30_9826:
 	inc	hl
 	ld	(ix+$1e), l
 	ld	(ix+$1f), h
-	ld	de, $01e0
+	ld	de, $00F0
 	xor	a
 	sbc	hl, de
 	ld	a, h