SONY -> RIVAL

This commit is contained in:
Rangi 2020-07-17 13:27:27 -04:00
parent 2454296d32
commit 30ecbf6ea3
19 changed files with 31 additions and 31 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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