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/rockethideout2.asm | |
| parent | Unify audio bank references (diff) | |
| parent | named more constants (diff) | |
| download | pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.gz pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.tar.xz pokeyellow-c34156c5fb333864c1ae85036ea587c9f615a65a.zip | |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/rockethideout2.asm')
| -rwxr-xr-x | scripts/rockethideout2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index ead69458..f269faef 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -422,9 +422,9 @@ RocketHideout2TextPointers: ; 450c7 (11:50c7) RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) - db $1 ; flag's bit + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range - dw wd817 ; flag's byte + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 dw RocketHideout2BattleText2 ; TextBeforeBattle dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle dw RocketHideout2EndBattleText2 ; TextEndBattle |