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/saffrongym.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/saffrongym.asm')
| -rwxr-xr-x | scripts/saffrongym.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 336d40e9..7c2eb559 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -31,7 +31,7 @@ SaffronGymText_5d048: ; 5d048 (17:5048) SaffronGymScriptPointers: ; 5d053 (17:5053) dw CheckFightingMapTrainers - dw Func_324c + dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw SaffronGymScript3 @@ -178,9 +178,9 @@ SaffronGymText1: ; 5d118 (17:5118) set 7, [hl] ld hl, SaffronGymText_5d167 ld de, SaffronGymText_5d167 - call PreBattleSaveRegisters + call SaveEndBattleTextPointers ldh a, [$8c] - ld [wcf13], a + ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 |