diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-07 18:06:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 18:06:55 -0700 |
| commit | 3196c5f78ee7f56873e8f401b804cbd2532b5bea (patch) | |
| tree | 84e23896b7dde125488f25db974bd510eab73556 /engine/pinball_game/evolution_mode | |
| parent | ff234d05228fb469488c92e03c1fb28e37b4a51c (diff) | |
| parent | ac423638ed154faac0a5b75dee346d037dbc5e63 (diff) | |
Merge pull request #11 from TwitchPlaysPokemon/chaos_requests
labeled some text and evolution stuff
Diffstat (limited to 'engine/pinball_game/evolution_mode')
| -rwxr-xr-x | engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 6 | ||||
| -rwxr-xr-x | engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 2 |
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
|