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 | |
| parent | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (diff) | |
No more standalone WRAM addresses in the Event Flags array
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/billshouse.asm | 3 | ||||
| -rwxr-xr-x | scripts/oakslab.asm | 6 | ||||
| -rwxr-xr-x | scripts/rockethideout4.asm | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index a3a86d74..b288a9fe 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -23,8 +23,7 @@ BillsHouseScript_1e09e: bit 7, [hl] set 7, [hl] ret nz - ld hl, wd7f2 - bit 5, [hl] + CheckEventHL EVENT_MET_BILL_2 jr z, .asm_1e0af jr .asm_1e0b3 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 diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 30ed3f24..d0e6f567 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -266,8 +266,7 @@ RocketHideout4Script13: xor a ld [hJoyHeld], a ld [wJoyIgnore], a - ld hl, wd81b - set 2, [hl] + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 ld a, $0 call RocketHideout4Script_4551e ret |