summaryrefslogtreecommitdiff
path: root/scripts/route6.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
commitf4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch)
treec5eb931244f739bd3a88d488586923b2a0762b74 /scripts/route6.asm
parentcd649184f556db777d592671a7274bfa4a8423d7 (diff)
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/route6.asm')
-rwxr-xr-xscripts/route6.asm48
1 files changed, 24 insertions, 24 deletions
diff --git a/scripts/route6.asm b/scripts/route6.asm
index ee6258cd..733c5eac 100755
--- a/scripts/route6.asm
+++ b/scripts/route6.asm
@@ -26,55 +26,55 @@ Route6TrainerHeader0: ; 590d7 (16:50d7)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText1 ; 0x512a TextBeforeBattle
- dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle
- dw Route6EndBattleText1 ; 0x512f TextEndBattle
- dw Route6EndBattleText1 ; 0x512f TextEndBattle
+ dw Route6BattleText1 ; TextBeforeBattle
+ dw Route6AfterBattleText1 ; TextAfterBattle
+ dw Route6EndBattleText1 ; TextEndBattle
+ dw Route6EndBattleText1 ; TextEndBattle
Route6TrainerHeader1: ; 590e3 (16:50e3)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText2 ; 0x5143 TextBeforeBattle
- dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle
- dw Route6EndBattleText2 ; 0x5148 TextEndBattle
- dw Route6EndBattleText2 ; 0x5148 TextEndBattle
+ dw Route6BattleText2 ; TextBeforeBattle
+ dw Route6AfterBattleText1 ; TextAfterBattle
+ dw Route6EndBattleText2 ; TextEndBattle
+ dw Route6EndBattleText2 ; TextEndBattle
Route6TrainerHeader2: ; 590ef (16:50ef)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText3 ; 0x5157 TextBeforeBattle
- dw Route6AfterBattleText3 ; 0x5161 TextAfterBattle
- dw Route6EndBattleText3 ; 0x515c TextEndBattle
- dw Route6EndBattleText3 ; 0x515c TextEndBattle
+ dw Route6BattleText3 ; TextBeforeBattle
+ dw Route6AfterBattleText3 ; TextAfterBattle
+ dw Route6EndBattleText3 ; TextEndBattle
+ dw Route6EndBattleText3 ; TextEndBattle
Route6TrainerHeader3: ; 590fb (16:50fb)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText4 ; 0x5170 TextBeforeBattle
- dw Route6AfterBattleText4 ; 0x517a TextAfterBattle
- dw Route6EndBattleText4 ; 0x5175 TextEndBattle
- dw Route6EndBattleText4 ; 0x5175 TextEndBattle
+ dw Route6BattleText4 ; TextBeforeBattle
+ dw Route6AfterBattleText4 ; TextAfterBattle
+ dw Route6EndBattleText4 ; TextEndBattle
+ dw Route6EndBattleText4 ; TextEndBattle
Route6TrainerHeader4: ; 59107 (16:5107)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText5 ; 0x5189 TextBeforeBattle
- dw Route6AfterBattleText5 ; 0x5193 TextAfterBattle
- dw Route6EndBattleText5 ; 0x518e TextEndBattle
- dw Route6EndBattleText5 ; 0x518e TextEndBattle
+ dw Route6BattleText5 ; TextBeforeBattle
+ dw Route6AfterBattleText5 ; TextAfterBattle
+ dw Route6EndBattleText5 ; TextEndBattle
+ dw Route6EndBattleText5 ; TextEndBattle
Route6TrainerHeader5: ; 59113 (16:5113)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte
- dw Route6BattleText6 ; 0x51a2 TextBeforeBattle
- dw Route6AfterBattleText6 ; 0x51ac TextAfterBattle
- dw Route6EndBattleText6 ; 0x51a7 TextEndBattle
- dw Route6EndBattleText6 ; 0x51a7 TextEndBattle
+ dw Route6BattleText6 ; TextBeforeBattle
+ dw Route6AfterBattleText6 ; TextAfterBattle
+ dw Route6EndBattleText6 ; TextEndBattle
+ dw Route6EndBattleText6 ; TextEndBattle
db $ff