diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /home | |
| parent | Merge pull request #277 from Rangi42/master (diff) | |
| parent | Missingno's Pokédex weight is two bytes like the rest (diff) | |
| download | pokeyellow-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 'home')
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/trainers.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 807d6a61..741b8b7e 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -2010,7 +2010,7 @@ LoadSurfingPlayerSpriteGraphics:: jr LoadPlayerSpriteGraphicsCommon LoadBikePlayerSpriteGraphics:: - ld de, RedCyclingSprite + ld de, RedBikeSprite ld hl, vNPCSprites LoadPlayerSpriteGraphicsCommon:: diff --git a/home/trainers.asm b/home/trainers.asm index fae3dde1..4bb355b7 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -395,11 +395,11 @@ CheckIfAlreadyEngaged:: PlayTrainerMusic:: ld a, [wEngagedTrainerClass] - cp OPP_SONY1 + cp OPP_RIVAL1 ret z - cp OPP_SONY2 + cp OPP_RIVAL2 ret z - cp OPP_SONY3 + cp OPP_RIVAL3 ret z ld a, [wGymLeaderNo] and a |