10 files changed, 37 insertions, 36 deletions
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
index 9dc8901..08e821c 100755
--- a/engine/pinball_game.asm
+++ b/engine/pinball_game.asm
@@ -156,7 +156,7 @@ GameScreenFunction_HandleBallPhysics: ; 0xd909
 	call Func_dc7c
 	call Func_dcb4
 .asm_d9e9
-	ld a, [wd57d]
+	ld a, [wTimerActive]
 	and a
 	callba nz, Func_86a4
 	ld a, [wd4ae]
diff --git a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
index 074d2a5..6d84ff9 100755
--- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
@@ -71,7 +71,7 @@ Func_ded6: ; 0xded6
 	ld a, [wSpecialMode]
 	and a
 	jr nz, .asm_deec
-	callba Func_10157
+	callba ConcludeCatchEmMode
 	ret
 
 .asm_deec
diff --git a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
index c5366c8..601bfe2 100755
--- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
@@ -36,7 +36,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2
 .asm_e025
 	xor a
 	ld [wd57e], a
-	ld [wd57d], a
+	ld [wTimerActive], a
 	xor a
 	ld [wd495], a
 	ld a, $1
diff --git a/engine/pinball_game/ball_loss/ball_loss_red_field.asm b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
index 27906b5..4097151 100755
--- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
@@ -71,7 +71,7 @@ Func_ddfd: ; 0xddfd
 	ld a, [wSpecialMode]
 	and a
 	jr nz, .asm_de14
-	callba Func_10157
+	callba ConcludeCatchEmMode
 	jr .asm_de40
 
 .asm_de14
diff --git a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
index 7db2efe..f1b22ae 100755
--- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
@@ -35,8 +35,8 @@ HandleBallLossSeelBonus: ; 0xe08b
 	lb de, $00, $02
 	call PlaySoundEffect
 	xor a
-	ld [wd57d], a
-	ld [wd57d], a
+	ld [wTimerActive], a
+	ld [wTimerActive], a ; duplicate instruction
 	ld [wd495], a
 	ld a, $1
 	ld [wd496], a
diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index 34bc6e8..6d983bd 100755
--- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
@@ -26,7 +26,7 @@ DrawSpritesRedFieldBottom: ; 0x1757e
 	ret
 
 DrawTimer: ; 0x175a4
-	ld a, [wd57d]
+	ld a, [wTimerActive]
 	and a
 	ret z
 	ld a, [hGameBoyColorFlag]
diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm
index f663109..3e2c1aa 100755
--- a/engine/pinball_game/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
@@ -29,7 +29,7 @@ _LoadStageDataRedFieldBottom: ; 0x1401c
 	ret
 
 Func_1404a: ; 0x1404a
-	ld a, [wd57d]
+	ld a, [wTimerActive]
 	and a
 	ret z
 	ld a, [hGameBoyColorFlag]
diff --git a/engine/pinball_game/timer.asm b/engine/pinball_game/timer.asm
index 1200877..49afcee 100755
--- a/engine/pinball_game/timer.asm
+++ b/engine/pinball_game/timer.asm
@@ -12,7 +12,7 @@ StartTimer: ; 0x867d
 	ld [wd57e], a
 	ld [wd57f], a
 	ld a, $1
-	ld [wd57d], a
+	ld [wTimerActive], a
 	ld a, $1
 	ld [wd580], a
 	callba Func_1404a
@@ -52,7 +52,7 @@ Func_86a4: ; 0x86a4
 	ld [hl], a
 	ret
 
-Func_86d2: ; 0x86d2
+StopTimer: ; 0x86d2
 	xor a
-	ld [wd57d], a
+	ld [wTimerActive], a
 	ret
diff --git a/main.asm b/main.asm
index 8afdd69..f575929 100755
--- a/main.asm
+++ b/main.asm
@@ -380,15 +380,15 @@ CheckForMew:
 	pop af
 	ret
 
-Func_10157: ; 0x10157
+ConcludeCatchEmMode: ; 0x10157
 	xor a
 	ld [wInSpecialMode], a
 	ld [wWildMonIsHittable], a
 	ld [wd5c6], a
 	ld [wd5b6], a
 	ld [wNumMonHits], a
-	call Func_10488
-	callba Func_86d2
+	call ClearWildMonCollisionMask
+	callba StopTimer
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_10178: ; 0x10178
@@ -876,7 +876,7 @@ LoadWildMonCollisionMask: ; 0x10464
 	call FarCopyData
 	ret
 
-Func_10488: ; 0x10488
+ClearWildMonCollisionMask: ; 0x10488
 	xor a
 	ld hl, wMonAnimatedCollisionMask
 	ld b, $20
@@ -1015,7 +1015,7 @@ CapturePokemon: ; 0x1052d
 	ld [wd548], a
 	ld [wd549], a
 	callba RestoreBallSaverAfterCatchEmMode
-	call Func_10157
+	call ConcludeCatchEmMode
 	ld de, $0001
 	call PlaySong
 	ld hl, wd628
@@ -1714,8 +1714,8 @@ Func_10ac8: ; 0x10ac8
 	ld [wNumMonHits], a
 	ld [wd551], a
 	ld [wd554], a
-	call Func_10488
-	callba Func_86d2
+	call ClearWildMonCollisionMask
+	callba StopTimer
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_10af3: ; 0x10af3
@@ -11863,7 +11863,7 @@ Func_18377: ; 0x18377
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld a, [wd6a2]
 	cp $5
 	ret nc
@@ -12570,7 +12570,7 @@ Func_187b1: ; 0x187b1
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld de, $0000
 	call PlaySong
 .asm_18826
@@ -13940,7 +13940,7 @@ Func_19451: ; 0x19451
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld a, [wd6b1]
 	cp $8
 	ret nc
@@ -14135,7 +14135,7 @@ Func_19531: ; 0x19531
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld de, $0000
 	call PlaySong
 .asm_195a2
@@ -23908,7 +23908,7 @@ Func_201ce: ; 0x201ce
 	ret nz
 	call FillBottomMessageBufferWithBlackTile
 	callba RestoreBallSaverAfterCatchEmMode
-	callba Func_10157
+	callba ConcludeCatchEmMode
 	ld de, $0001
 	call PlaySong
 	scf
@@ -23929,7 +23929,7 @@ Func_201f2: ; 0x201f2
 	jr nz, .asm_2021b
 	callba SetPokemonOwnedFlag
 .asm_2021b
-	callba Func_86d2
+	callba StopTimer
 	callba Func_106a6
 	ret
 
@@ -24208,7 +24208,7 @@ Func_2048f: ; 0x2048f
 	ret nz
 	call FillBottomMessageBufferWithBlackTile
 	callba RestoreBallSaverAfterCatchEmMode
-	callba Func_10157
+	callba ConcludeCatchEmMode
 	ld de, $0001
 	call PlaySong
 	scf
@@ -24229,7 +24229,7 @@ Func_204b3: ; 0x204b3
 	jr nz, .notMew
 	callba SetPokemonOwnedFlag
 .notMew
-	callba Func_86d2
+	callba StopTimer
 	callba Func_106a6
 	ret
 
@@ -24564,7 +24564,7 @@ Func_2077b: ; 0x2077b
 	callba Func_14135
 	callba Func_16425
 .asm_207f5
-	callba Func_86d2
+	callba StopTimer
 	call FillBottomMessageBufferWithBlackTile
 	call Func_30db
 	ld hl, wd5cc
@@ -25293,7 +25293,7 @@ Func_20da0: ; 0x20da0
 	callba Func_1c2cb
 	callba Func_1e8f6
 .asm_20e1a
-	callba Func_86d2
+	callba StopTimer
 	call FillBottomMessageBufferWithBlackTile
 	call Func_30db
 	ld hl, wd5cc
@@ -26276,7 +26276,7 @@ Func_2442a: ; 0x2442a
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld a, $1
 	ld [wd713], a
 	ld a, $1
@@ -29729,7 +29729,7 @@ Func_25c5a: ; 0x25c5a
 	ld a, $1
 	ld [wd7be], a
 	call Func_2862
-	callba Func_86d2
+	callba StopTimer
 	ld a, $3
 	ld [wd791], a
 	ld a, [wd794]
@@ -33820,7 +33820,7 @@ Func_3022b: ; 0x3022b
 	xor a
 	ld [wInSpecialMode], a
 	ld [wSpecialMode], a
-	callba Func_86d2
+	callba StopTimer
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_30247: ; 0x30247
@@ -37387,7 +37387,7 @@ SecondMapMoveSet_BlueField:
 	db CINNABAR_ISLAND
 
 Func_314ae: ; 0x314ae
-	ld a, [wd57d]
+	ld a, [wTimerActive]
 	and a
 	ld a, [wd54c]
 	jr z, .asm_314d0
@@ -37469,7 +37469,7 @@ Func_3151f: ; 0x3151f
 	callba Func_16425
 	callba Func_30253
 .asm_31577
-	callba Func_86d2
+	callba StopTimer
 	call FillBottomMessageBufferWithBlackTile
 	call Func_30db
 	ld hl, wd5cc
@@ -37537,7 +37537,7 @@ Func_315d5: ; 0x315d5
 	ret
 
 Func_3161b: ; 0x3161b
-	ld a, [wd57d]
+	ld a, [wTimerActive]
 	and a
 	ld a, [wd54c]
 	jr z, .asm_3163d
@@ -37623,7 +37623,7 @@ Func_3168c: ; 0x3168c
 	callba Func_1e8f6
 	callba Func_30253
 .asm_316ee
-	callba Func_86d2
+	callba StopTimer
 	call FillBottomMessageBufferWithBlackTile
 	call Func_30db
 	ld hl, wd5cc
diff --git a/wram.asm b/wram.asm
index 5ef9a36..8a5568d 100755
--- a/wram.asm
+++ b/wram.asm
@@ -800,7 +800,8 @@ wTimerMinutes:: ; 0xd57b
 wTimerFrames:: ; 0xd57c
 	ds $1
 
-wd57d:: ; 0xd57d
+wTimerActive:: ; 0xd57d
+; Set to 1 when the Timer is displayed and counting down.
 	ds $1
 
 wd57e:: ; 0xd57e