diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/route13.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/route13.asm')
-rwxr-xr-x | scripts/route13.asm | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/scripts/route13.asm b/scripts/route13.asm index 911c15af..61f43ee9 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -1,4 +1,4 @@ -Route13Script: ; 5581e (15:581e) +Route13Script: call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeaders ld de, Route13ScriptPointers @@ -7,12 +7,12 @@ Route13Script: ; 5581e (15:581e) ld [wRoute13CurScript], a ret -Route13ScriptPointers: ; 55831 (15:5831) +Route13ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route13TextPointers: ; 55837 (15:5837) +Route13TextPointers: dw Route13Text1 dw Route13Text2 dw Route13Text3 @@ -27,8 +27,8 @@ Route13TextPointers: ; 55837 (15:5837) dw Route13Text12 dw Route13Text13 -Route13TrainerHeaders: ; 55851 (15:5851) -Route13TrainerHeader0: ; 55851 (15:5851) +Route13TrainerHeaders: +Route13TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0 @@ -37,7 +37,7 @@ Route13TrainerHeader0: ; 55851 (15:5851) dw Route13EndBattleText2 ; TextEndBattle dw Route13EndBattleText2 ; TextEndBattle -Route13TrainerHeader2: ; 5585d (15:585d) +Route13TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 @@ -46,7 +46,7 @@ Route13TrainerHeader2: ; 5585d (15:585d) dw Route13EndBattleText3 ; TextEndBattle dw Route13EndBattleText3 ; TextEndBattle -Route13TrainerHeader3: ; 55869 (15:5869) +Route13TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 @@ -55,7 +55,7 @@ Route13TrainerHeader3: ; 55869 (15:5869) dw Route13EndBattleText4 ; TextEndBattle dw Route13EndBattleText4 ; TextEndBattle -Route13TrainerHeader4: ; 55875 (15:5875) +Route13TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 @@ -64,7 +64,7 @@ Route13TrainerHeader4: ; 55875 (15:5875) dw Route13EndBattleText5 ; TextEndBattle dw Route13EndBattleText5 ; TextEndBattle -Route13TrainerHeader5: ; 55881 (15:5881) +Route13TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 @@ -73,7 +73,7 @@ Route13TrainerHeader5: ; 55881 (15:5881) dw Route13EndBattleText6 ; TextEndBattle dw Route13EndBattleText6 ; TextEndBattle -Route13TrainerHeader6: ; 5588d (15:588d) +Route13TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 @@ -82,7 +82,7 @@ Route13TrainerHeader6: ; 5588d (15:588d) dw Route13EndBattleText7 ; TextEndBattle dw Route13EndBattleText7 ; TextEndBattle -Route13TrainerHeader7: ; 55899 (15:5899) +Route13TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7 @@ -91,7 +91,7 @@ Route13TrainerHeader7: ; 55899 (15:5899) dw Route13EndBattleText8 ; TextEndBattle dw Route13EndBattleText8 ; TextEndBattle -Route13TrainerHeader8: ; 558a5 (15:58a5) +Route13TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 @@ -100,7 +100,7 @@ Route13TrainerHeader8: ; 558a5 (15:58a5) dw Route13EndBattleText9 ; TextEndBattle dw Route13EndBattleText9 ; TextEndBattle -Route13TrainerHeader9: ; 558b1 (15:58b1) +Route13TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 @@ -109,7 +109,7 @@ Route13TrainerHeader9: ; 558b1 (15:58b1) dw Route13EndBattleText10 ; TextEndBattle dw Route13EndBattleText10 ; TextEndBattle -Route13TrainerHeader10: ; 558bd (15:58bd) +Route13TrainerHeader10: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1 @@ -120,194 +120,194 @@ Route13TrainerHeader10: ; 558bd (15:58bd) db $ff -Route13Text1: ; 558ca (15:58ca) +Route13Text1: TX_ASM ld hl, Route13TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route13BattleText2: ; 558d4 (15:58d4) +Route13BattleText2: TX_FAR _Route13BattleText2 db "@" -Route13EndBattleText2: ; 558d9 (15:58d9) +Route13EndBattleText2: TX_FAR _Route13EndBattleText2 db "@" -Route13AfterBattleText2: ; 558de (15:58de) +Route13AfterBattleText2: TX_FAR _Route13AfterBattleText2 db "@" -Route13Text2: ; 558e3 (15:58e3) +Route13Text2: TX_ASM ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route13BattleText3: ; 558ed (15:58ed) +Route13BattleText3: TX_FAR _Route13BattleText3 db "@" -Route13EndBattleText3: ; 558f2 (15:58f2) +Route13EndBattleText3: TX_FAR _Route13EndBattleText3 db "@" -Route13AfterBattleText3: ; 558f7 (15:58f7) +Route13AfterBattleText3: TX_FAR _Route13AfterBattleText3 db "@" -Route13Text3: ; 558fc (15:58fc) +Route13Text3: TX_ASM ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route13BattleText4: ; 55906 (15:5906) +Route13BattleText4: TX_FAR _Route13BattleText4 db "@" -Route13EndBattleText4: ; 5590b (15:590b) +Route13EndBattleText4: TX_FAR _Route13EndBattleText4 db "@" -Route13AfterBattleText4: ; 55910 (15:5910) +Route13AfterBattleText4: TX_FAR _Route13AfterBattleText4 db "@" -Route13Text4: ; 55915 (15:5915) +Route13Text4: TX_ASM ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route13BattleText5: ; 5591f (15:591f) +Route13BattleText5: TX_FAR _Route13BattleText5 db "@" -Route13EndBattleText5: ; 55924 (15:5924) +Route13EndBattleText5: TX_FAR _Route13EndBattleText5 db "@" -Route13AfterBattleText5: ; 55929 (15:5929) +Route13AfterBattleText5: TX_FAR _Route13AfterBattleText5 db "@" -Route13Text5: ; 5592e (15:592e) +Route13Text5: TX_ASM ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route13BattleText6: ; 55938 (15:5938) +Route13BattleText6: TX_FAR _Route13BattleText6 db "@" -Route13EndBattleText6: ; 5593d (15:593d) +Route13EndBattleText6: TX_FAR _Route13EndBattleText6 db "@" -Route13AfterBattleText6: ; 55942 (15:5942) +Route13AfterBattleText6: TX_FAR _Route13AfterBattleText6 db "@" -Route13Text6: ; 55947 (15:5947) +Route13Text6: TX_ASM ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route13BattleText7: ; 55951 (15:5951) +Route13BattleText7: TX_FAR _Route13BattleText7 db "@" -Route13EndBattleText7: ; 55956 (15:5956) +Route13EndBattleText7: TX_FAR _Route13EndBattleText7 db "@" -Route13AfterBattleText7: ; 5595b (15:595b) +Route13AfterBattleText7: TX_FAR _Route13AfterBattleText7 db "@" -Route13Text7: ; 55960 (15:5960) +Route13Text7: TX_ASM ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route13BattleText8: ; 5596a (15:596a) +Route13BattleText8: TX_FAR _Route13BattleText8 db "@" -Route13EndBattleText8: ; 5596f (15:596f) +Route13EndBattleText8: TX_FAR _Route13EndBattleText8 db "@" -Route13AfterBattleText8: ; 55974 (15:5974) +Route13AfterBattleText8: TX_FAR _Route13AfterBattleText8 db "@" -Route13Text8: ; 55979 (15:5979) +Route13Text8: TX_ASM ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route13BattleText9: ; 55983 (15:5983) +Route13BattleText9: TX_FAR _Route13BattleText9 db "@" -Route13EndBattleText9: ; 55988 (15:5988) +Route13EndBattleText9: TX_FAR _Route13EndBattleText9 db "@" -Route13AfterBattleText9: ; 5598d (15:598d) +Route13AfterBattleText9: TX_FAR _Route13AfterBattleText9 db "@" -Route13Text9: ; 55992 (15:5992) +Route13Text9: TX_ASM ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route13BattleText10: ; 5599c (15:599c) +Route13BattleText10: TX_FAR _Route13BattleText10 db "@" -Route13EndBattleText10: ; 559a1 (15:59a1) +Route13EndBattleText10: TX_FAR _Route13EndBattleText10 db "@" -Route13AfterBattleText10: ; 559a6 (15:59a6) +Route13AfterBattleText10: TX_FAR _Route13AfterBattleText10 db "@" -Route13Text10: ; 559ab (15:59ab) +Route13Text10: TX_ASM ld hl, Route13TrainerHeader10 call TalkToTrainer jp TextScriptEnd -Route13BattleText11: ; 559b5 (15:59b5) +Route13BattleText11: TX_FAR _Route13BattleText11 db "@" -Route13EndBattleText11: ; 559ba (15:59ba) +Route13EndBattleText11: TX_FAR _Route13EndBattleText11 db "@" -Route13AfterBattleText11: ; 559bf (15:59bf) +Route13AfterBattleText11: TX_FAR _Route13AfterBattleText11 db "@" -Route13Text11: ; 559c4 (15:59c4) +Route13Text11: TX_FAR _Route13Text11 db "@" -Route13Text12: ; 559c9 (15:59c9) +Route13Text12: TX_FAR _Route13Text12 db "@" -Route13Text13: ; 559ce (15:59ce) +Route13Text13: TX_FAR _Route13Text13 db "@" |