Fix SPECIAL_MODE_ constants. They were mislabeled.

7 files changed, 15 insertions, 15 deletions

diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm
index fb7152d..f50ba26 100644
--- a/constants/pinball_game_constants.asm
+++ b/constants/pinball_game_constants.asm
@@ -3,9 +3,9 @@ MAX_PIKACHU_SAVER_CHARGE EQU 15
 CATCHEM_MODE_SLOT_REWARD   EQU 1

 EVOLUTION_MODE_SLOT_REWARD EQU 2

 

-SPECIAL_MODE_CATCHEM   EQU 1

-SPECIAL_MODE_EVOLUTION EQU 2

-SPECIAL_MODE_MAP_MOVE  EQU 2 ; shares value with SPECIAL_MODE_EVOLUTION

+SPECIAL_MODE_CATCHEM   EQU 0

+SPECIAL_MODE_EVOLUTION EQU 1

+SPECIAL_MODE_MAP_MOVE  EQU 2

 

 ; To encounter Mew, you must first beat Mewtwo's bonus stage 2 times.

 NUM_MEWTWO_COMPLETIONS_FOR_MEW EQU 2

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

diff --git a/main.asm b/main.asm
index 8c0807f..d69c889 100644
--- a/main.asm
+++ b/main.asm
@@ -110,9 +110,9 @@ CheckSpecialModeColision: ; 0x10000
 	ld a, c
 	ld [wSpecialModeCollisionID], a
 	ld a, [wSpecialMode]
-	cp SPECIAL_MODE_CATCHEM ;branch based on mode
+	cp SPECIAL_MODE_EVOLUTION ;branch based on mode
 	jp z, HandleEvoModeCollision ;call evo mode logic
-	cp SPECIAL_MODE_EVOLUTION
+	cp SPECIAL_MODE_MAP_MOVE
 	jr nz, .CatchMode  ;call catch mode logic
 	callba HandleMapModeCollision ;call map move logic
 	ret