Merge pull request #34 from TomHarte/MoreJumpTweaks

Tweak jump numbers a little further.
TomHarte · Nov 18, 2024 · 022fc19 · 022fc19
2 parents 28bc5cd + 816e0cb
commit 022fc19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/generated/map.z80s b/src/generated/map.z80s
@@ -152,8 +152,8 @@
 		db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x5c, 0x08
 		db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x5c, 0x5c, 0x08
 		db 0x00, 0x20, 0x24, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x5c, 0x5c, 0x08
-		db 0x00, 0x28, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		db 0x00, 0x30, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+		db 0x00, 0x28, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c
+		db 0x00, 0x30, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c
 		db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x5c, 0x5c, 0x08
 		db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x5c, 0x08
 		db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x08

diff --git a/src/player_logic.z80s b/src/player_logic.z80s
@@ -1,8 +1,8 @@
 ;
 ; Constants affecting motion.
 ;
-INITIAL_JUMP_STRENGTH:		EQU 420							; Force applied on the first frame of jumping.
-PER_FRAME_JUMP_DECREMENT:	EQU INITIAL_JUMP_STRENGTH/15	; Amount by which force applied decreases each frame while the button is pressed.
+INITIAL_JUMP_STRENGTH:		EQU 300							; Force applied on the first frame of jumping.
+PER_FRAME_JUMP_DECREMENT:	EQU INITIAL_JUMP_STRENGTH/20	; Amount by which force applied decreases each frame while the button is pressed.
 @player_jump_strength:		dw 0							; Records current jump strength.
 @allow_new_jump:			dw 0							; Indicates whether a new jump request should be honoured; 0 = true.