diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-23 21:20:20 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-23 21:20:20 -0700 |
| commit | e6d02b4b7b69701f223fe9100ccc21ad2089afc4 (patch) | |
| tree | 61546ed0204332e97b27f71f92c42bf595073c65 /scripts/oakslab.asm | |
| parent | 6af65df2fcc0b8018f3e9e81de25a76425ff0c3e (diff) | |
make route22 rival events more consistent
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 620923ad..a2fa4338 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -634,7 +634,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) predef HideObject SetEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE ResetEventReuseHL EVENT_2ND_ROUTE22_RIVAL_BATTLE - SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_FIGHT + SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, HS_ROUTE_22_RIVAL_1 ld [wcc4d], a predef ShowObject @@ -985,7 +985,7 @@ OaksLabText5: ; 1d248 (7:5248) ld b,POKE_BALL call IsItemInBag jr nz, .asm_1d2e7 - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_FIGHT + CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE jr nz, .asm_1d2d0 CheckEvent EVENT_GOT_POKEDEX jr nz, .asm_1d2c8 |