foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SONY -> RIVAL

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/play_battle_music.asm
View file

@ -16,7 +16,7 @@ PlayBattleMusic::
ld a, [wCurOpponent] ld a, [wCurOpponent]
cp OPP_ID_OFFSET cp OPP_ID_OFFSET
jr c, .wildBattle jr c, .wildBattle
cp OPP_SONY3 cp OPP_RIVAL3
jr z, .finalBattle jr z, .finalBattle
cp OPP_LANCE cp OPP_LANCE
jr nz, .normalTrainerBattle jr nz, .normalTrainerBattle

6
constants/trainer_constants.asm
View file

@ -31,7 +31,7 @@ ENDM
trainer_const TAMER ; $16 trainer_const TAMER ; $16
trainer_const BIRD_KEEPER ; $17 trainer_const BIRD_KEEPER ; $17
trainer_const BLACKBELT ; $18 trainer_const BLACKBELT ; $18
trainer_const SONY1 ; $19 trainer_const RIVAL1 ; $19
trainer_const PROF_OAK ; $1A trainer_const PROF_OAK ; $1A
trainer_const CHIEF ; $1B trainer_const CHIEF ; $1B
trainer_const SCIENTIST ; $1C trainer_const SCIENTIST ; $1C
@ -48,8 +48,8 @@ ENDM
trainer_const BLAINE ; $27 trainer_const BLAINE ; $27
trainer_const SABRINA ; $28 trainer_const SABRINA ; $28
trainer_const GENTLEMAN ; $29 trainer_const GENTLEMAN ; $29
trainer_const SONY2 ; $2A trainer_const RIVAL2 ; $2A
trainer_const SONY3 ; $2B trainer_const RIVAL3 ; $2B
trainer_const LORELEI ; $2C trainer_const LORELEI ; $2C
trainer_const CHANNELER ; $2D trainer_const CHANNELER ; $2D
trainer_const AGATHA ; $2E trainer_const AGATHA ; $2E

2
data/maps/objects/OaksLab.asm
View file

@ -8,7 +8,7 @@ OaksLab_Object:
db 0 ; signs db 0 ; signs
db 11 ; objects db 11 ; objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person

2
data/maps/objects/SSAnne2F.asm
View file

@ -16,7 +16,7 @@ SSAnne2F_Object:
db 2 ; objects db 2 ; objects
object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1
; warp-to ; warp-to
warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS

6
data/trainers/move_choices.asm
View file

@ -32,7 +32,7 @@ TrainerClassMoveChoiceModifications:
move_choices 1 ; TAMER move_choices 1 ; TAMER
move_choices 1 ; BIRD_KEEPER move_choices 1 ; BIRD_KEEPER
move_choices 1 ; BLACKBELT move_choices 1 ; BLACKBELT
move_choices 1 ; SONY1 move_choices 1 ; RIVAL1
move_choices 1, 3 ; PROF_OAK move_choices 1, 3 ; PROF_OAK
move_choices 1, 2 ; CHIEF move_choices 1, 2 ; CHIEF
move_choices 1, 2 ; SCIENTIST move_choices 1, 2 ; SCIENTIST
@ -49,8 +49,8 @@ TrainerClassMoveChoiceModifications:
move_choices 1, 3 ; BLAINE move_choices 1, 3 ; BLAINE
move_choices 1, 3 ; SABRINA move_choices 1, 3 ; SABRINA
move_choices 1, 2 ; GENTLEMAN move_choices 1, 2 ; GENTLEMAN
move_choices 1, 3 ; SONY2 move_choices 1, 3 ; RIVAL2
move_choices 1, 3 ; SONY3 move_choices 1, 3 ; RIVAL3
move_choices 1, 2, 3 ; LORELEI move_choices 1, 2, 3 ; LORELEI
move_choices 1 ; CHANNELER move_choices 1 ; CHANNELER
move_choices 1 ; AGATHA move_choices 1 ; AGATHA

4
engine/battle/core.asm
View file

@ -921,7 +921,7 @@ TrainerBattleVictory:
ld b, MUSIC_DEFEATED_TRAINER ld b, MUSIC_DEFEATED_TRAINER
.gymleader .gymleader
ld a, [wTrainerClass] ld a, [wTrainerClass]
cp SONY3 ; final battle against rival cp RIVAL3 ; final battle against rival
jr nz, .notrival jr nz, .notrival
ld b, MUSIC_DEFEATED_GYM_LEADER ld b, MUSIC_DEFEATED_GYM_LEADER
ld hl, wFlags_D733 ld hl, wFlags_D733
@ -1134,7 +1134,7 @@ HandlePlayerBlackOut:
cp LINK_STATE_BATTLING cp LINK_STATE_BATTLING
jr z, .notSony1Battle jr z, .notSony1Battle
ld a, [wCurOpponent] ld a, [wCurOpponent]
cp OPP_SONY1 cp OPP_RIVAL1
jr nz, .notSony1Battle jr nz, .notSony1Battle
hlcoord 0, 0 ; sony 1 battle hlcoord 0, 0 ; sony 1 battle
lb bc, 8, 21 lb bc, 8, 21

6
engine/battle/get_trainer_name.asm
View file

@ -5,11 +5,11 @@ GetTrainerName_::
jr nz, .foundName jr nz, .foundName
ld hl, wRivalName ld hl, wRivalName
ld a, [wTrainerClass] ld a, [wTrainerClass]
cp SONY1 cp RIVAL1
jr z, .foundName jr z, .foundName
cp SONY2 cp RIVAL2
jr z, .foundName jr z, .foundName
cp SONY3 cp RIVAL3
jr z, .foundName jr z, .foundName
ld [wd0b5], a ld [wd0b5], a
ld a, TRAINER_NAME ld a, TRAINER_NAME

2
engine/battle/read_trainer_party.asm
View file

@ -116,7 +116,7 @@ ReadTrainer:
; no matches found. is this trainer champion rival? ; no matches found. is this trainer champion rival?
ld a, b ld a, b
cp SONY3 cp RIVAL3
jr z, .ChampionRival jr z, .ChampionRival
jr .FinishUp ; nope jr .FinishUp ; nope
.GiveTeamMoves .GiveTeamMoves

2
engine/link/cable_club.asm
View file

@ -274,7 +274,7 @@ CableClub_DoBattleOrTradeAgain:
jr nz, .trading jr nz, .trading
ld a, LINK_STATE_BATTLING ld a, LINK_STATE_BATTLING
ld [wLinkState], a ld [wLinkState], a
ld a, OPP_SONY1 ld a, OPP_RIVAL1
ld [wCurOpponent], a ld [wCurOpponent], a
call ClearScreen call ClearScreen
call Delay3 call Delay3

6
engine/overworld/auto_movement.asm
View file

@ -286,7 +286,7 @@ FreezeEnemyTrainerSprite::
jp SetSpriteMovementBytesToFF jp SetSpriteMovementBytesToFF
RivalIDs: RivalIDs:
db OPP_SONY1 db OPP_RIVAL1
db OPP_SONY2 db OPP_RIVAL2
db OPP_SONY3 db OPP_RIVAL3
db -1 ; end db -1 ; end

6
home/trainers.asm
View file

@ -395,11 +395,11 @@ CheckIfAlreadyEngaged::
PlayTrainerMusic:: PlayTrainerMusic::
ld a, [wEngagedTrainerClass] ld a, [wEngagedTrainerClass]
cp OPP_SONY1 cp OPP_RIVAL1
ret z ret z
cp OPP_SONY2 cp OPP_RIVAL2
ret z ret z
cp OPP_SONY3 cp OPP_RIVAL3
ret z ret z
ld a, [wGymLeaderNo] ld a, [wGymLeaderNo]
and a and a

2
scripts/CeruleanCity.asm
View file

@ -138,7 +138,7 @@ CeruleanCityScript1:
ld hl, CeruleanCityText_1966d ld hl, CeruleanCityText_1966d
ld de, CeruleanCityText_19672 ld de, CeruleanCityText_19672
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY1 ld a, OPP_RIVAL1
ld [wCurOpponent], a ld [wCurOpponent], a
; select which team to use during the encounter ; select which team to use during the encounter

2
scripts/ChampionsRoom.asm
View file

@ -64,7 +64,7 @@ GaryScript2:
ld hl, GaryDefeatedText ld hl, GaryDefeatedText
ld de, GaryVictoryText ld de, GaryVictoryText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY3 ld a, OPP_RIVAL3
ld [wCurOpponent], a ld [wCurOpponent], a
; select which team to use during the encounter ; select which team to use during the encounter

2
scripts/OaksLab.asm
View file

@ -381,7 +381,7 @@ OaksLabScript11:
ret nz ret nz
; define which team rival uses, and fight it ; define which team rival uses, and fight it
ld a, OPP_SONY1 ld a, OPP_RIVAL1
ld [wCurOpponent], a ld [wCurOpponent], a
ld a, [wRivalStarter] ld a, [wRivalStarter]
cp STARTER2 cp STARTER2

2
scripts/PokemonTower2F.asm
View file

@ -146,7 +146,7 @@ PokemonTower2Text1:
ld hl, PokemonTower2Text_60632 ld hl, PokemonTower2Text_60632
ld de, PokemonTower2Text_60637 ld de, PokemonTower2Text_60637
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY2 ld a, OPP_RIVAL2
ld [wCurOpponent], a ld [wCurOpponent], a
; select which team to use during the encounter ; select which team to use during the encounter

4
scripts/Route22.asm
View file

@ -131,7 +131,7 @@ Route22Script1:
ld hl, Route22RivalDefeatedText1 ld hl, Route22RivalDefeatedText1
ld de, Route22Text_511bc ld de, Route22Text_511bc
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY1 ld a, OPP_RIVAL1
ld [wCurOpponent], a ld [wCurOpponent], a
ld hl, StarterMons_50faf ld hl, StarterMons_50faf
call Route22Script_50ed6 call Route22Script_50ed6
@ -287,7 +287,7 @@ Route22Script4:
ld hl, Route22RivalDefeatedText2 ld hl, Route22RivalDefeatedText2
ld de, Route22Text_511d0 ld de, Route22Text_511d0
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY2 ld a, OPP_RIVAL2
ld [wCurOpponent], a ld [wCurOpponent], a
ld hl, StarterMons_510d9 ld hl, StarterMons_510d9
call Route22Script_50ed6 call Route22Script_50ed6

2
scripts/SSAnne2F.asm
View file

@ -96,7 +96,7 @@ SSAnne2Script1:
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, OPP_SONY2 ld a, OPP_RIVAL2
ld [wCurOpponent], a ld [wCurOpponent], a
; select which team to use during the encounter ; select which team to use during the encounter

2
scripts/SilphCo7F.asm
View file

@ -183,7 +183,7 @@ SilphCo7Script3:
ld hl, SilphCo7Text14 ld hl, SilphCo7Text14
ld de, SilphCo7Text_51ecd ld de, SilphCo7Text_51ecd
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, OPP_SONY2 ld a, OPP_RIVAL2
ld [wCurOpponent], a ld [wCurOpponent], a
ld a, [wRivalStarter] ld a, [wRivalStarter]
cp STARTER2 cp STARTER2

2
wram.asm
View file

@ -2944,7 +2944,7 @@ wd732::
; bit 0: play time being counted ; bit 0: play time being counted
; bit 1: remnant of debug mode; only set by the debug build. ; bit 1: remnant of debug mode; only set by the debug build.
; if it is set: ; if it is set:
; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name ; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and RIVAL as the rival's name
; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) ; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap])
; 3. allows wild battles to be avoided by holding down B ; 3. allows wild battles to be avoided by holding down B
; furthermore, in the debug build: ; furthermore, in the debug build: