diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-20 18:32:02 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-20 18:32:26 -0700 |
| commit | fcab935a0f449246380480613ac0896e0b90a0d8 (patch) | |
| tree | 60391cf3fa91cc8173d13cc9fd75c050d9898e0c /scripts/bruno.asm | |
| parent | 13e28b0ece7c7888cba792cc6f7219b384213427 (diff) | |
enumerate events
Diffstat (limited to 'scripts/bruno.asm')
| -rwxr-xr-x | scripts/bruno.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 76a5919a..9cd55193 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -13,8 +13,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec) bit 5, [hl] res 5, [hl] ret z - ld a, [wd864] - bit 1, a + CheckEvent EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 jr z, .asm_76300 ld a, $5 jp BrunoScript_76302 @@ -70,9 +69,7 @@ BrunoScript0: ; 76339 (1d:6339) ld a, [wCoordIndex] cp $3 jr c, .asm_7635d - ld hl, wd864 - bit 6, [hl] - set 6, [hl] + CheckAndSetEvent EVENT_8EE jr z, BrunoScript_7631d .asm_7635d ld a, $2 @@ -121,9 +118,9 @@ BrunoTextPointers: ; 763a8 (1d:63a8) BrunoTrainerHeaders: ; 763ac (1d:63ac) BrunoTrainerHeader0: ; 763ac (1d:63ac) - db $1 ; flag's bit + dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range - dw wd864 ; flag's byte + dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 dw BrunoBeforeBattleText ; TextBeforeBattle dw BrunoAfterBattleText ; TextAfterBattle dw BrunoEndBattleText ; TextEndBattle |