aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PokemonTower2F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /scripts/PokemonTower2F.asm
parentMerge pull request #277 from Rangi42/master (diff)
parentMissingno's Pokédex weight is two bytes like the rest (diff)
downloadpokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'scripts/PokemonTower2F.asm')
-rwxr-xr-xscripts/PokemonTower2F.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index b3d7a1cb..be3b5b89 100755
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -146,7 +146,7 @@ PokemonTower2Text1:
ld hl, PokemonTower2Text_60632
ld de, PokemonTower2Text_60637
call SaveEndBattleTextPointers
- ld a, OPP_SONY2
+ ld a, OPP_RIVAL2
ld [wCurOpponent], a
; select which team to use during the encounter