summaryrefslogtreecommitdiff
path: root/scripts/ssanne9.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
commitc34156c5fb333864c1ae85036ea587c9f615a65a (patch)
tree70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /scripts/ssanne9.asm
parenta6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff)
parentdcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff)
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/ssanne9.asm')
-rwxr-xr-xscripts/ssanne9.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm
index 0cee1e08..525a2964 100755
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -32,36 +32,36 @@ SSAnne9TextPointers: ; 61b6a (18:5b6a)
SSAnne9TrainerHeaders: ; 61b84 (18:5b84)
SSAnne9TrainerHeader0: ; 61b84 (18:5b84)
- db $1 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
db ($2 << 4) ; trainer's view range
- dw wd807 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0
dw SSAnne9BattleText1 ; TextBeforeBattle
dw SSAnne9AfterBattleText1 ; TextAfterBattle
dw SSAnne9EndBattleText1 ; TextEndBattle
dw SSAnne9EndBattleText1 ; TextEndBattle
SSAnne9TrainerHeader1: ; 61b90 (18:5b90)
- db $2 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1
db ($3 << 4) ; trainer's view range
- dw wd807 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1
dw SSAnne9BattleText2 ; TextBeforeBattle
dw SSAnne9AfterBattleText2 ; TextAfterBattle
dw SSAnne9EndBattleText2 ; TextEndBattle
dw SSAnne9EndBattleText2 ; TextEndBattle
SSAnne9TrainerHeader2: ; 61b9c (18:5b9c)
- db $3 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2
db ($3 << 4) ; trainer's view range
- dw wd807 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2
dw SSAnne9BattleText3 ; TextBeforeBattle
dw SSAnne9AfterBattleText3 ; TextAfterBattle
dw SSAnne9EndBattleText3 ; TextEndBattle
dw SSAnne9EndBattleText3 ; TextEndBattle
SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8)
- db $4 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3
db ($2 << 4) ; trainer's view range
- dw wd807 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3
dw SSAnne9BattleText4 ; TextBeforeBattle
dw SSAnne9AfterBattleText4 ; TextAfterBattle
dw SSAnne9EndBattleText4 ; TextEndBattle