diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/battle/get_trainer_name.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/battle/get_trainer_name.asm')
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 961f25cf..36492292 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,10 +1,10 @@ GetTrainerName_: ; 13a58 (4:7a58) - ld hl, W_GRASSRATE + ld hl, wGrassRate ld a, [wLinkState] and a jr nz, .rival - ld hl, W_RIVALNAME - ld a, [W_TRAINERCLASS] + ld hl, wRivalName + ld a, [wTrainerClass] cp SONY1 jr z, .rival cp SONY2 @@ -19,6 +19,6 @@ GetTrainerName_: ; 13a58 (4:7a58) call GetName ld hl, wcd6d .rival - ld de, W_TRAINERNAME + ld de, wTrainerName ld bc, $d jp CopyData |