diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
| commit | c34156c5fb333864c1ae85036ea587c9f615a65a (patch) | |
| tree | 70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /scripts/lorelei.asm | |
| parent | a6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff) | |
| parent | dcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff) | |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/lorelei.asm')
| -rwxr-xr-x | scripts/lorelei.asm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index eb6c3e7d..4a245d93 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -13,10 +13,9 @@ LoreleiScript_76191: ; 76191 (1d:6191) bit 5, [hl] res 5, [hl] ret z - ld hl, wd734 + ld hl, wBeatLorelei set 1, [hl] - ld a, [wd863] - bit 1, a + CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 jr z, .asm_761a9 ld a, $5 jr .asm_761ab @@ -71,9 +70,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld a, [wCoordIndex] cp $3 jr c, .asm_76206 - ld hl, wd863 - bit 6, [hl] - set 6, [hl] + CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 @@ -121,9 +118,9 @@ LoreleiTextPointers: ; 76251 (1d:6251) LoreleiTrainerHeaders: ; 76255 (1d:6255) LoreleiTrainerHeader0: ; 76255 (1d:6255) - db $1 ; flag's bit + dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range - dw wd863 ; flag's byte + dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 dw LoreleiBeforeBattleText ; TextBeforeBattle dw LoreleiAfterBattleText ; TextAfterBattle dw LoreleiEndBattleText ; TextEndBattle |