From 19e432cb6dd46bb9ebef08ac927a644d3eef2de0 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 6 Jan 2023 18:41:03 -0600
Subject: [PATCH] Friendlier modulo representations

---
 engine/pinball_game/catchem_mode.asm                 |  4 ++--
 .../blue_stage_resolve_collision.asm                 | 12 ++++++------
 home.asm                                             |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index b55f14c..a5593c7 100644
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -823,13 +823,13 @@ CapturePokemonAnimation: ; 0x1052d
 	ld hl, wNumPokemonCaughtInBallBonus
 	call Increment_Max100
 	jr nc, .notMaxed
-	ld c, $a
+	ld c, 10
 	call Modulo_C
 	callba z, AddExtraBall ; increments bonus multiplier every 10 pokemon caught
 .notMaxed
 	call SetPokemonOwnedFlag
 	ld a, [wPreviousNumPokeballs]
-	cp $3
+	cp 3
 	ret z
 	inc a
 	ld [wNumPokeballs], a
diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
index 059fe73..293660b 100644
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -824,7 +824,7 @@ UpdatePikachuSaverAnimation_BlueField: ; 0x1d133
 	ld hl, wNumPikachuSaves
 	call Increment_Max100
 	jr nc, .asm_1d185
-	ld c, $a
+	ld c, 10
 	call Modulo_C
 	callba z, AddExtraBall
 .asm_1d185
@@ -971,7 +971,7 @@ ResolveSlowpokeCollision: ; 0x1d216
 	ld hl, wNumBellsproutEntries ; This is an oversight. No need to tally bellsprout.
 	call Increment_Max100
 	ret nc
-	ld c, $19
+	ld c, 25
 	call Modulo_C
 	callba z, AddExtraBall
 	ret
@@ -1093,7 +1093,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	ld hl, wNumBellsproutEntries
 	call Increment_Max100
 	ret nc
-	ld c, $19
+	ld c, 25
 	call Modulo_C
 	callba z, AddExtraBall
 	ret
@@ -1224,7 +1224,7 @@ ResolveBonusMultiplierCollision_BlueField: ; 0x1d438
 .setNewBonusMultplier
 	ld [wCurBonusMultiplier], a
 	jr nc, .asm_1d4e9
-	ld c, $19
+	ld c, 25
 	call Modulo_C
 	callba z, AddExtraBall
 .asm_1d4e9
@@ -1776,7 +1776,7 @@ HitPoliwag3Times: ; 0x1ddc7
 	ld hl, wNumDugtrioTriples ; developer oversight
 	call Increment_Max100
 	jr nc, .asm_1dde4
-	ld c, $a
+	ld c, 10
 	call Modulo_C
 	callba z, AddExtraBall
 .asm_1dde4
@@ -1792,7 +1792,7 @@ HitPsyduck3Times: ; 0x1ddf4
 	ld hl, wNumDugtrioTriples ; developer oversight
 	call Increment_Max100
 	jr nc, .asm_1de11
-	ld c, $a
+	ld c, 10
 	call Modulo_C
 	callba z, AddExtraBall
 .asm_1de11
diff --git a/home.asm b/home.asm
index 5a65348..4aa5796 100644
--- a/home.asm
+++ b/home.asm
@@ -880,7 +880,7 @@ Increment_Max100: ; 0xe4a
 ; Increments the value at [hl], but caps it at 100.
 ; Sets carry flag if the increment happens.
 	ld a, [hl]
-	cp $64
+	cp 100
 	jr z, .maxValue
 	inc a
 	ld [hl], a