diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-06 16:08:20 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-06 16:08:20 -0500 |
| commit | 6ddc025942a03802acf6a2731d7b46f2672ae74f (patch) | |
| tree | 97cf0f4bca92254f5e6d32bd78505bca9f6cda94 /home.asm | |
| parent | c3911c80cf8400f81518532c13912c647b81b880 (diff) | |
engine/battle/trainer_ai.asm
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2690,7 +2690,7 @@ InitBattleEnemyParameters:: ; 3273 (0:3273) cp 200 ld a, [wEngagedTrainerSet] jr c, .noTrainer - ld [W_TRAINERNO], a + ld [wTrainerNo], a ret .noTrainer ld [wCurEnemyLVL], a @@ -3214,7 +3214,7 @@ GetTrainerInformation:: ; 3563 (0:3563) jr nz, .linkBattle ld a, BANK(TrainerPicAndMoneyPointers) call BankswitchHome - ld a, [W_TRAINERCLASS] + ld a, [wTrainerClass] dec a ld hl, TrainerPicAndMoneyPointers ld bc, $5 @@ -3242,10 +3242,10 @@ GetTrainerInformation:: ; 3563 (0:3563) ret IsFightingJessieJames:: ; 359e (0:359e) - ld a,[W_TRAINERCLASS] + ld a,[wTrainerClass] cp ROCKET ret nz - ld a,[W_TRAINERNO] + ld a,[wTrainerNo] cp $2a ret c ld de,JessieJamesPic |