From b4d7dffd1cb3bcaaf0cebbbbe42cb6b70d02bef8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 7 Jul 2017 19:51:37 -0700 Subject: Label evolution, joypad, message box things --- engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 4 ++-- engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 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 abf1ca8..a1af8f5 100755 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -175,7 +175,7 @@ Func_20c76: ; 0x20c76 Func_20d30: ; 0x20d30 callba RestoreBallSaverAfterCatchEmMode callba PlaceEvolutionInParty - callba Func_10ac8 + callba ConcludeEvolutionMode ld de, $0001 call PlaySong ld hl, wNumPokemonEvolvedInBallBonus @@ -201,7 +201,7 @@ Func_20d7c: ; 0x20d7c ret nz call FillBottomMessageBufferWithBlackTile callba RestoreBallSaverAfterCatchEmMode - callba Func_10ac8 + callba ConcludeEvolutionMode ld de, $0001 call PlaySong scf 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 3b42550..a1149c1 100755 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -178,7 +178,7 @@ Func_20651: ; 0x20651 Func_2070b: ; 0x2070b callba RestoreBallSaverAfterCatchEmMode callba PlaceEvolutionInParty - callba Func_10ac8 + callba ConcludeEvolutionMode ld de, $0001 call PlaySong ld hl, wNumPokemonEvolvedInBallBonus @@ -204,7 +204,7 @@ Func_20757: ; 0x20757 ret nz call FillBottomMessageBufferWithBlackTile callba RestoreBallSaverAfterCatchEmMode - callba Func_10ac8 + callba ConcludeEvolutionMode ld de, $0001 call PlaySong scf -- cgit v1.2.3