No more $C8

Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
This commit is contained in:
dannye 2015-08-10 11:09:16 -05:00
parent 31d267d4ad
commit dfc152d667
88 changed files with 428 additions and 423 deletions

View file

@ -134,7 +134,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
ld hl, CeruleanCityText_1966d
ld de, CeruleanCityText_19672
call SaveEndBattleTextPointers
ld a, SONY1 + $c8
ld a, OPP_SONY1
ld [W_CUROPPONENT], a
; select which team to use during the encounter

View file

@ -64,7 +64,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
ld hl, GaryText_760f9
ld de, GaryText_760fe
call SaveEndBattleTextPointers
ld a, SONY3 + $c8
ld a, OPP_SONY3
ld [W_CUROPPONENT], a
; select which team to use during the encounter

View file

@ -381,7 +381,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
ret nz
; define which team rival uses, and fight it
ld a, SONY1 + $C8
ld a, OPP_SONY1
ld [W_CUROPPONENT], a
ld a, [W_RIVALSTARTER]
cp STARTER2

View file

@ -142,7 +142,7 @@ PokemonTower2Text1: ; 605df (18:45df)
ld hl, PokemonTower2Text_60632
ld de, PokemonTower2Text_60637
call SaveEndBattleTextPointers
ld a, SONY2 + $c8
ld a, OPP_SONY2
ld [W_CUROPPONENT], a
; select which team to use during the encounter

View file

@ -131,7 +131,7 @@ Route22Script1: ; 50f62 (14:4f62)
ld hl, Route22RivalDefeatedText1
ld de, Route22Text_511bc
call SaveEndBattleTextPointers
ld a, SONY1 + $c8
ld a, OPP_SONY1
ld [W_CUROPPONENT], a
ld hl, StarterMons_50faf
call Route22Script_50ed6
@ -287,7 +287,7 @@ Route22Script4: ; 51087 (14:5087)
ld hl, Route22RivalDefeatedText2
ld de, Route22Text_511d0
call SaveEndBattleTextPointers
ld a, SONY2 + $c8
ld a, OPP_SONY2
ld [W_CUROPPONENT], a
ld hl, StarterMons_510d9
call Route22Script_50ed6

View file

@ -183,7 +183,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
ld hl, SilphCo7Text14
ld de, SilphCo7Text_51ecd
call SaveEndBattleTextPointers
ld a, SONY2 + $c8
ld a, OPP_SONY2
ld [W_CUROPPONENT], a
ld a, [W_RIVALSTARTER]
cp STARTER2

View file

@ -97,7 +97,7 @@ SSAnne2Script1: ; 61430 (18:5430)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, SONY2 + $c8
ld a, OPP_SONY2
ld [W_CUROPPONENT], a
; select which team to use during the encounter