From da4e2bbd49eadfa084341dd11df39a392047e404 Mon Sep 17 00:00:00 2001
From: chaos-lord <dd4791.mariokarter@hotmail.co.uk>
Date: Wed, 12 Jul 2017 18:59:28 +0100
Subject: labelled collision handlers

---
 .../evolution_mode/evolution_mode_blue_field.asm   |  4 ++--
 .../evolution_mode/evolution_mode_red_field.asm    | 26 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engine/pinball_game/evolution_mode')

diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
index 128ea12..afcb9ea 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -1,5 +1,5 @@
-Func_20bae: ; 0x20bae
-	ld a, [wd54c]
+HandleBlueEvoModeCollision: ; 0x20bae
+	ld a, [wSpecialModeCollisionID]
 	cp $4
 	jp z, Func_20e34
 	cp $1
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
index a78ceae..5bbf336 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -1,21 +1,21 @@
-Func_20581: ; 0x20581
-	ld a, [wd54c]
+HandleRedEvoModeCollision: ; 0x20581
+	ld a, [wSpecialModeCollisionID]
 	cp $4
-	jp z, Func_2080f
+	jp z, Func_2080f ;voltorb
 	cp $3
 	jp z, Func_20839
 	cp $5
-	jp z, Func_2085a
+	jp z, Func_2085a ;bellsprout
 	cp $6
-	jp z, Func_20887
+	jp z, Func_20887 ;staryu
 	cp $7
-	jp z, Func_208a8
+	jp z, Func_208a8 ;diglett
 	cp $8
-	jp z, Func_208c9
+	jp z, Func_208c9 ;diglett
 	cp $9
-	jp z, Func_208ea
+	jp z, Func_208ea ;right rail?
 	cp $a
-	jp z, Func_2090b
+	jp z, Func_2090b ;right rail?
 	cp $b
 	jp z, Func_2092c
 	cp $c
@@ -355,16 +355,16 @@ Func_20887: ; 0x20887
 Func_208a8: ; 0x208a8
 	ld a, [wd551]
 	and a
-	jr nz, .asm_208c7
+	jr nz, .asm_208c7 ;if ??? is NZ, skip
 	ld a, [wIndicatorStates + 13]
 	and a
-	jr z, .asm_208c7
+	jr z, .asm_208c7 ;if indicator is off, skip
 	xor a
-	ld [wIndicatorStates + 13], a
+	ld [wIndicatorStates + 13], a ;flick off indicator
 	ld a, [wd55d]
 	and a
 	ld a, $0
-	ld [wd55d], a
+	ld [wd55d], a ;make ??? 0
 	jp nz, Func_20977
 	jp Func_209eb
 
-- 
cgit v1.2.3