diff options
author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /scripts/pokemontower3.asm | |
parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'scripts/pokemontower3.asm')
-rwxr-xr-x | scripts/pokemontower3.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index f05623fb..8df5bfc5 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -9,7 +9,7 @@ PokemonTower3Script: ; 606cc (18:46cc) PokemonTower3ScriptPointers: ; 606df (18:46df) dw CheckFightingMapTrainers - dw Func_324c + dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle PokemonTower3TextPointers: ; 606e5 (18:46e5) |