From f56a2fc512cfd0ff348f255a913bdeab29476893 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 19 Jul 2017 22:16:44 -0700
Subject: Fix SPECIAL_MODE_ constants. They were mislabeled.

---
 engine/pinball_game/ball_loss/ball_loss_blue_field.asm  | 2 +-
 engine/pinball_game/ball_loss/ball_loss_red_field.asm   | 2 +-
 engine/pinball_game/evolution_mode.asm                  | 2 +-
 engine/pinball_game/load_stage_data/load_blue_field.asm | 6 +++---
 engine/pinball_game/load_stage_data/load_red_field.asm  | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engine')

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 a6aee69..d331a4e 100644
--- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
@@ -75,7 +75,7 @@ Func_ded6: ; 0xded6
 	ret
 
 .asm_deec
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	jr nz, .asm_df05
 	ld a, $0
 	ld [wSlotIsOpen], a
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 03b2252..1233f26 100644
--- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
@@ -75,7 +75,7 @@ Func_ddfd: ; 0xddfd
 	jr .asm_de40
 
 .asm_de14
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	jr nz, .asm_de2d
 	xor a
 	ld [wSlotIsOpen], a
diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm
index d6db1a8..a14e3ba 100755
--- a/engine/pinball_game/evolution_mode.asm
+++ b/engine/pinball_game/evolution_mode.asm
@@ -361,7 +361,7 @@ SelectPokemonToEvolve: ; 0x10cb7
 	call LoadVRAMData
 .asm_10cfc
 	call FillBottomMessageBufferWithBlackTile
-	ld a, SPECIAL_MODE_CATCHEM
+	ld a, SPECIAL_MODE_EVOLUTION
 	ld [wDrawBottomMessageBox], a
 	ld [wInSpecialMode], a
 	ld [wSpecialMode], a
diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm
index f9eb138..c305346 100644
--- a/engine/pinball_game/load_stage_data/load_blue_field.asm
+++ b/engine/pinball_game/load_stage_data/load_blue_field.asm
@@ -211,7 +211,7 @@ Func_1c305: ; 0x1c305
 	and a
 	ret z
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_EVOLUTION
+	cp SPECIAL_MODE_MAP_MOVE
 	ret z
 	ld a, [wd5c6]
 	and a
@@ -318,7 +318,7 @@ Func_1c3ee: ; 0x1c3ee
 	and a
 	ret z
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	ret nz
 	ld a, [wd554]
 	cp $3
@@ -366,7 +366,7 @@ Func_1c43c: ; 0x1c43c
 	ret
 
 .asm_1c450
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	jr nz, .asm_1c458
 	call Func_1c47d
 	ret
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 f195f92..046b2e6 100644
--- a/engine/pinball_game/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
@@ -160,7 +160,7 @@ Func_1414b: ; 0x1414b
 	and a
 	ret z
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_EVOLUTION
+	cp SPECIAL_MODE_MAP_MOVE
 	ret z
 	ld a, [wd5c6]
 	and a
@@ -267,7 +267,7 @@ Func_14234: ; 0x14234
 	and a
 	ret z
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	ret nz
 	ld a, [wd554]
 	cp $3
@@ -315,7 +315,7 @@ Func_14282: ; 0x14282
 	ret
 
 .asm_14296
-	cp SPECIAL_MODE_CATCHEM
+	cp SPECIAL_MODE_EVOLUTION
 	jr nz, .asm_1429e
 	call Func_142c3
 	ret
@@ -460,7 +460,7 @@ Func_14377: ; 0x14377
 
 .asm_143b1
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_EVOLUTION
+	cp SPECIAL_MODE_MAP_MOVE
 	ret nz
 	ld a, [wd54d]
 	cp $3
-- 
cgit v1.2.3