diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
| commit | b88572fbccecc8d125fe8a50365751f0530d1a9a (patch) | |
| tree | 46a733a0ad7259689b9b5577f109751f34f42956 /scripts | |
| parent | 5f8f221bad050e54c150d1c5ca8d827284235091 (diff) | |
Add constants for player and rival starters
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/OaksLab.asm | 14 | ||||
| -rwxr-xr-x | scripts/PalletTown.asm | 2 | ||||
| -rwxr-xr-x | scripts/Route22.asm | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 0d995a66..3d9fde89 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -226,7 +226,7 @@ OaksLabScript9: ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, 1 + ld a, RIVAL_STARTER_JOLTEON ld [wRivalStarter], a ld a, EEVEE ld [wd11e], a @@ -371,10 +371,10 @@ OaksLabScript14: ; Otherwise, it will evolve into Vaporeon. ld a, [wBattleResult] and a - ld b, $3 - jr nz, .asm_1c660 - ld b, $2 -.asm_1c660 + ld b, RIVAL_STARTER_VAPOREON + jr nz, .got_rival_starter + ld b, RIVAL_STARTER_FLAREON +.got_rival_starter ld a, b ld [wRivalStarter], a @@ -1009,7 +1009,7 @@ OaksLabRivalTakesText5: OaksLabText18: text_asm - ld a, PIKACHU + ld a, STARTER_PIKACHU ld [wPlayerStarter], a ld [wd11e], a call GetMonName @@ -1023,7 +1023,7 @@ OaksLabText18: ld [wMonDataLocation], a ld a, 5 ld [wCurEnemyLVL], a - ld a, PIKACHU + ld a, STARTER_PIKACHU ld [wd11e], a ld [wcf91], a call AddPartyMon diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 45a675e7..e7cc1f7a 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -141,7 +141,7 @@ PalletTownScript4: ld [wListScrollOffset], a ld a, BATTLE_TYPE_PIKACHU ld [wBattleType], a - ld a, PIKACHU + ld a, STARTER_PIKACHU ld [wCurOpponent], a ld a, 5 ld [wCurEnemyLVL], a diff --git a/scripts/Route22.asm b/scripts/Route22.asm index 5dfdc67e..4ffeff23 100755 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -148,11 +148,11 @@ Route22Script2: cp $ff jp z, Route22Script_50ece ld a, [wRivalStarter] - cp 2 - jr nz, .asm_50fc9 - ld a, $1 + cp RIVAL_STARTER_FLAREON + jr nz, .keep_rival_starter + ld a, RIVAL_STARTER_JOLTEON ld [wRivalStarter], a -.asm_50fc9 +.keep_rival_starter ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .notDown |