diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CeruleanCity.asm | 2 | ||||
| -rwxr-xr-x | scripts/ChampionsRoom.asm | 2 | ||||
| -rwxr-xr-x | scripts/OaksLab.asm | 2 | ||||
| -rwxr-xr-x | scripts/PokemonTower2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/Route22.asm | 4 | ||||
| -rwxr-xr-x | scripts/SSAnne2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/SilphCo7F.asm | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 4d960537..eef63536 100755 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -138,7 +138,7 @@ CeruleanCityScript1: ld hl, CeruleanCityText_1966d ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ; select which team to use during the encounter diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index d151bb4d..11f99ee1 100755 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -64,7 +64,7 @@ GaryScript2: ld hl, GaryDefeatedText ld de, GaryVictoryText call SaveEndBattleTextPointers - ld a, OPP_SONY3 + ld a, OPP_RIVAL3 ld [wCurOpponent], a ; select which team to use during the encounter diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index dbc3b071..9d60cc19 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -381,7 +381,7 @@ OaksLabScript11: ret nz ; define which team rival uses, and fight it - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 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 diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 2e3f171e..1b02752f 100755 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -131,7 +131,7 @@ Route22Script1: ld hl, Route22RivalDefeatedText1 ld de, Route22Text_511bc call SaveEndBattleTextPointers - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ld hl, StarterMons_50faf call Route22Script_50ed6 @@ -287,7 +287,7 @@ Route22Script4: ld hl, Route22RivalDefeatedText2 ld de, Route22Text_511d0 call SaveEndBattleTextPointers - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ld hl, StarterMons_510d9 call Route22Script_50ed6 diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index 6b216350..b9f15b56 100755 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -96,7 +96,7 @@ SSAnne2Script1: ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ; select which team to use during the encounter diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 32a95fb5..59f90f0e 100755 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -183,7 +183,7 @@ SilphCo7Script3: ld hl, SilphCo7Text14 ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 |