summaryrefslogtreecommitdiff
path: root/scripts/route15.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-26 14:04:56 -0700
committeryenatch <yenatch@gmail.com>2014-05-26 22:04:39 -0700
commit40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch)
tree6de26c959808d5a792b692f2300c33557c1dbfab /scripts/route15.asm
parent52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff)
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
Diffstat (limited to 'scripts/route15.asm')
-rwxr-xr-xscripts/route15.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/route15.asm b/scripts/route15.asm
index f7eaa758..789ace21 100755
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@@ -30,7 +30,7 @@ Route15TrainerHeaders: ; 597df (16:57df)
Route15TrainerHeader0: ; 597df (16:57df)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText1 ; 0x5898 TextBeforeBattle
dw Route15AfterBattleText1 ; 0x58a2 TextAfterBattle
dw Route15EndBattleText1 ; 0x589d TextEndBattle
@@ -39,7 +39,7 @@ Route15TrainerHeader0: ; 597df (16:57df)
Route15TrainerHeader1: ; 597eb (16:57eb)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText2 ; 0x58a7 TextBeforeBattle
dw Route15AfterBattleText2 ; 0x58b1 TextAfterBattle
dw Route15EndBattleText2 ; 0x58ac TextEndBattle
@@ -48,7 +48,7 @@ Route15TrainerHeader1: ; 597eb (16:57eb)
Route15TrainerHeader2: ; 597f7 (16:57f7)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText3 ; 0x58b6 TextBeforeBattle
dw Route15AfterBattleText3 ; 0x58c0 TextAfterBattle
dw Route15EndBattleText3 ; 0x58bb TextEndBattle
@@ -57,7 +57,7 @@ Route15TrainerHeader2: ; 597f7 (16:57f7)
Route15TrainerHeader3: ; 59803 (16:5803)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText4 ; 0x58c5 TextBeforeBattle
dw Route15AfterBattleText4 ; 0x58cf TextAfterBattle
dw Route15EndBattleText4 ; 0x58ca TextEndBattle
@@ -66,7 +66,7 @@ Route15TrainerHeader3: ; 59803 (16:5803)
Route15TrainerHeader4: ; 5980f (16:580f)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText5 ; 0x58d4 TextBeforeBattle
dw Route15AfterBattleText5 ; 0x58de TextAfterBattle
dw Route15EndBattleText5 ; 0x58d9 TextEndBattle
@@ -75,7 +75,7 @@ Route15TrainerHeader4: ; 5980f (16:580f)
Route15TrainerHeader5: ; 5981b (16:581b)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText6 ; 0x58e3 TextBeforeBattle
dw Route15AfterBattleText6 ; 0x58ed TextAfterBattle
dw Route15EndBattleText6 ; 0x58e8 TextEndBattle
@@ -84,7 +84,7 @@ Route15TrainerHeader5: ; 5981b (16:581b)
Route15TrainerHeader6: ; 59827 (16:5827)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText7 ; 0x58f2 TextBeforeBattle
dw Route15AfterBattleText7 ; 0x58fc TextAfterBattle
dw Route15EndBattleText7 ; 0x58f7 TextEndBattle
@@ -93,7 +93,7 @@ Route15TrainerHeader6: ; 59827 (16:5827)
Route15TrainerHeader7: ; 59833 (16:5833)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText8 ; 0x5901 TextBeforeBattle
dw Route15AfterBattleText8 ; 0x590b TextAfterBattle
dw Route15EndBattleText8 ; 0x5906 TextEndBattle
@@ -102,7 +102,7 @@ Route15TrainerHeader7: ; 59833 (16:5833)
Route15TrainerHeader8: ; 5983f (16:583f)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText9 ; 0x5910 TextBeforeBattle
dw Route15AfterBattleText9 ; 0x591a TextAfterBattle
dw Route15EndBattleText9 ; 0x5915 TextEndBattle
@@ -111,7 +111,7 @@ Route15TrainerHeader8: ; 5983f (16:583f)
Route15TrainerHeader9: ; 5984b (16:584b)
db $a ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText10 ; 0x591f TextBeforeBattle
dw Route15AfterBattleText10 ; 0x5929 TextAfterBattle
dw Route15EndBattleText10 ; 0x5924 TextEndBattle