summaryrefslogtreecommitdiff
path: root/scripts/viridianforest.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-20 18:32:02 -0700
committerYamaArashi <shadow962@live.com>2015-07-20 18:32:26 -0700
commitfcab935a0f449246380480613ac0896e0b90a0d8 (patch)
tree60391cf3fa91cc8173d13cc9fd75c050d9898e0c /scripts/viridianforest.asm
parent13e28b0ece7c7888cba792cc6f7219b384213427 (diff)
enumerate events
Diffstat (limited to 'scripts/viridianforest.asm')
-rwxr-xr-xscripts/viridianforest.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm
index 554c2125..892eeef2 100755
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -30,27 +30,27 @@ ViridianForestTextPointers: ; 61126 (18:5126)
ViridianForestTrainerHeaders: ; 61142 (18:5142)
ViridianForestTrainerHeader0: ; 61142 (18:5142)
- db $2 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
db ($4 << 4) ; trainer's view range
- dw wd7f3 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
dw ViridianForestBattleText1 ; TextBeforeBattle
dw ViridianForestAfterBattleText1 ; TextAfterBattle
dw ViridianForestEndBattleText1 ; TextEndBattle
dw ViridianForestEndBattleText1 ; TextEndBattle
ViridianForestTrainerHeader1: ; 6114e (18:514e)
- db $3 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1
db ($4 << 4) ; trainer's view range
- dw wd7f3 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1
dw ViridianForestBattleText2 ; TextBeforeBattle
dw ViridianForestAfterBattleText2 ; TextAfterBattle
dw ViridianForestEndBattleText2 ; TextEndBattle
dw ViridianForestEndBattleText2 ; TextEndBattle
ViridianForestTrainerHeader2: ; 6115a (18:515a)
- db $4 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2
db ($1 << 4) ; trainer's view range
- dw wd7f3 ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2
dw ViridianForestBattleText3 ; TextBeforeBattle
dw ViridianForestAfterBattleText3 ; TextAfterBattle
dw ViridianForestEndBattleText3 ; TextEndBattle