diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 01:05:34 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 01:05:34 -0400 |
| commit | 19656f9dee2671838983ab407e901bd6bb49006a (patch) | |
| tree | 2bdaaa8a7093eb4216de9d7b157477003ed6375d /scripts/oakslab.asm | |
| parent | Merge branch 'master' of github.com:pret/pokeyellow (diff) | |
| download | pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.tar.gz pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.tar.xz pokeyellow-19656f9dee2671838983ab407e901bd6bb49006a.zip | |
No more standalone WRAM addresses in the Event Flags array
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 71e900eb..6648acb1 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -129,8 +129,7 @@ OaksLabScript4: ; 1cbd2 (7:445f) ret OaksLabScript5: ; 1cbfd (7:4bfd) - ld hl, wd74b - set 1, [hl] + SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON ld a, $fc ld [wJoyIgnore], a ld a, $d @@ -392,8 +391,7 @@ OaksLabScript14: xor a ld [wSpriteStateData1 + 1 * $10 + 9], a predef HealParty - ld hl, wd74b - set 3, [hl] + SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB ld a, $f ld [W_OAKSLABCURSCRIPT], a ret |