summaryrefslogtreecommitdiff
path: root/engine/pinball_game/evolution_mode
diff options
context:
space:
mode:
authorchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-07 09:25:15 +0100
committerchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-08 01:33:55 +0100
commitac423638ed154faac0a5b75dee346d037dbc5e63 (patch)
tree0dfbd7b075568601910042ff00de336925d1dc7a /engine/pinball_game/evolution_mode
parentef17a2820d16b9f488875d2d0c07dbc0e1dd0c04 (diff)
labeled some text and evolution stuff
Diffstat (limited to 'engine/pinball_game/evolution_mode')
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_blue_field.asm6
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_red_field.asm2
2 files changed, 4 insertions, 4 deletions
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 a9b0b00..abf1ca8 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -174,7 +174,7 @@ Func_20c76: ; 0x20c76
Func_20d30: ; 0x20d30
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
+ callba PlaceEvolutionInParty
callba Func_10ac8
ld de, $0001
call PlaySong
@@ -186,9 +186,9 @@ Func_20d30: ; 0x20d30
ret z
add $2
cp $3
- jr c, .asm_20d72
+ jr c, .DontClampBalls
ld a, $3
-.asm_20d72
+.DontClampBalls
ld [wNumPokeballs], a
ld a, $80
ld [wPokeballBlinkingCounter], a
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 ca7faaf..3b42550 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -177,7 +177,7 @@ Func_20651: ; 0x20651
Func_2070b: ; 0x2070b
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
+ callba PlaceEvolutionInParty
callba Func_10ac8
ld de, $0001
call PlaySong