summaryrefslogtreecommitdiff
path: root/scripts/route21.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/route21.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/route21.asm')
-rwxr-xr-xscripts/route21.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/route21.asm b/scripts/route21.asm
index 2332d2c8..034282f8 100755
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@@ -27,7 +27,7 @@ Route21TrainerHeaders: ; 55f16 (15:5f16)
Route21TrainerHeader0: ; 55f16 (15:5f16)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText1 ; 0x5fdd TextBeforeBattle
dw Route21AfterBattleText1 ; 0x5fe7 TextAfterBattle
dw Route21EndBattleText1 ; 0x5fe2 TextEndBattle
@@ -36,7 +36,7 @@ Route21TrainerHeader0: ; 55f16 (15:5f16)
Route21TrainerHeader1: ; 55f22 (15:5f22)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText2 ; 0x5fec TextBeforeBattle
dw Route21AfterBattleText2 ; 0x5ff6 TextAfterBattle
dw Route21EndBattleText2 ; 0x5ff1 TextEndBattle
@@ -45,7 +45,7 @@ Route21TrainerHeader1: ; 55f22 (15:5f22)
Route21TrainerHeader2: ; 55f2e (15:5f2e)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText3 ; 0x5ffb TextBeforeBattle
dw Route21AfterBattleText3 ; 0x6005 TextAfterBattle
dw Route21EndBattleText3 ; 0x6000 TextEndBattle
@@ -54,7 +54,7 @@ Route21TrainerHeader2: ; 55f2e (15:5f2e)
Route21TrainerHeader3: ; 55f3a (15:5f3a)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText4 ; 0x600a TextBeforeBattle
dw Route21AfterBattleText4 ; 0x6014 TextAfterBattle
dw Route21EndBattleText4 ; 0x600f TextEndBattle
@@ -63,7 +63,7 @@ Route21TrainerHeader3: ; 55f3a (15:5f3a)
Route21TrainerHeader4: ; 55f46 (15:5f46)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText5 ; 0x6019 TextBeforeBattle
dw Route21AfterBattleText5 ; 0x6023 TextAfterBattle
dw Route21EndBattleText5 ; 0x601e TextEndBattle
@@ -72,7 +72,7 @@ Route21TrainerHeader4: ; 55f46 (15:5f46)
Route21TrainerHeader5: ; 55f52 (15:5f52)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText6 ; 0x6028 TextBeforeBattle
dw Route21AfterBattleText6 ; 0x6032 TextAfterBattle
dw Route21EndBattleText6 ; 0x602d TextEndBattle
@@ -81,7 +81,7 @@ Route21TrainerHeader5: ; 55f52 (15:5f52)
Route21TrainerHeader6: ; 55f5e (15:5f5e)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText7 ; 0x6037 TextBeforeBattle
dw Route21AfterBattleText7 ; 0x6041 TextAfterBattle
dw Route21EndBattleText7 ; 0x603c TextEndBattle
@@ -90,7 +90,7 @@ Route21TrainerHeader6: ; 55f5e (15:5f5e)
Route21TrainerHeader7: ; 55f6a (15:5f6a)
db $8 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText8 ; 0x6046 TextBeforeBattle
dw Route21AfterBattleText8 ; 0x6050 TextAfterBattle
dw Route21EndBattleText8 ; 0x604b TextEndBattle
@@ -99,7 +99,7 @@ Route21TrainerHeader7: ; 55f6a (15:5f6a)
Route21TrainerHeader8: ; 55f76 (15:5f76)
db $9 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText9 ; 0x6055 TextBeforeBattle
dw Route21AfterBattleText9 ; 0x605f TextAfterBattle
dw Route21EndBattleText9 ; 0x605a TextEndBattle