diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:24:04 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-06-11 17:24:04 -0700 |
commit | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/route3.asm | |
parent | cee4d559f999312837da7d69e2c6704e85c159d4 (diff) |
remove address comments
Diffstat (limited to 'scripts/route3.asm')
-rwxr-xr-x | scripts/route3.asm | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/scripts/route3.asm b/scripts/route3.asm index 4640d767..b2c5de3e 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -1,4 +1,4 @@ -Route3Script: ; 554f8 (15:54f8) +Route3Script: call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 ld de, Route3ScriptPointers @@ -7,12 +7,12 @@ Route3Script: ; 554f8 (15:54f8) ld [wRoute3CurScript], a ret -Route3ScriptPointers: ; 5550b (15:550b) +Route3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route3TextPointers: ; 55511 (15:5511) +Route3TextPointers: dw Route3Text1 dw Route3Text2 dw Route3Text3 @@ -24,8 +24,8 @@ Route3TextPointers: ; 55511 (15:5511) dw Route3Text9 dw Route3Text10 -Route3TrainerHeaders: ; 55525 (15:5525) -Route3TrainerHeader0: ; 55525 (15:5525) +Route3TrainerHeaders: +Route3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0 @@ -34,7 +34,7 @@ Route3TrainerHeader0: ; 55525 (15:5525) dw Route3EndBattleText1 ; TextEndBattle dw Route3EndBattleText1 ; TextEndBattle -Route3TrainerHeader2: ; 55531 (15:5531) +Route3TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 @@ -43,7 +43,7 @@ Route3TrainerHeader2: ; 55531 (15:5531) dw Route3EndBattleText2 ; TextEndBattle dw Route3EndBattleText2 ; TextEndBattle -Route3TrainerHeader3: ; 5553d (15:553d) +Route3TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 @@ -52,7 +52,7 @@ Route3TrainerHeader3: ; 5553d (15:553d) dw Route3EndBattleText3 ; TextEndBattle dw Route3EndBattleText3 ; TextEndBattle -Route3TrainerHeader4: ; 55549 (15:5549) +Route3TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 @@ -61,7 +61,7 @@ Route3TrainerHeader4: ; 55549 (15:5549) dw Route3EndBattleText4 ; TextEndBattle dw Route3EndBattleText4 ; TextEndBattle -Route3TrainerHeader5: ; 55555 (15:5555) +Route3TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 @@ -70,7 +70,7 @@ Route3TrainerHeader5: ; 55555 (15:5555) dw Route3EndBattleText5 ; TextEndBattle dw Route3EndBattleText5 ; TextEndBattle -Route3TrainerHeader6: ; 55561 (15:5561) +Route3TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6 @@ -79,7 +79,7 @@ Route3TrainerHeader6: ; 55561 (15:5561) dw Route3EndBattleText6 ; TextEndBattle dw Route3EndBattleText6 ; TextEndBattle -Route3TrainerHeader7: ; 5556d (15:556d) +Route3TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 @@ -88,7 +88,7 @@ Route3TrainerHeader7: ; 5556d (15:556d) dw Route3EndBattleText7 ; TextEndBattle dw Route3EndBattleText7 ; TextEndBattle -Route3TrainerHeader8: ; 55579 (15:5579) +Route3TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1 @@ -99,154 +99,154 @@ Route3TrainerHeader8: ; 55579 (15:5579) db $ff -Route3Text1: ; 55586 (15:5586) +Route3Text1: TX_FAR _Route3Text1 db "@" -Route3Text2: ; 5558b (15:558b) +Route3Text2: TX_ASM ld hl, Route3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route3BattleText1: ; 55595 (15:5595) +Route3BattleText1: TX_FAR _Route3BattleText1 db "@" -Route3EndBattleText1: ; 5559a (15:559a) +Route3EndBattleText1: TX_FAR _Route3EndBattleText1 db "@" -Route3AfterBattleText1: ; 5559f (15:559f) +Route3AfterBattleText1: TX_FAR _Route3AfterBattleText1 db "@" -Route3Text3: ; 555a4 (15:55a4) +Route3Text3: TX_ASM ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route3BattleText2: ; 555ae (15:55ae) +Route3BattleText2: TX_FAR _Route3BattleText2 db "@" -Route3EndBattleText2: ; 555b3 (15:55b3) +Route3EndBattleText2: TX_FAR _Route3EndBattleText2 db "@" -Route3AfterBattleText2: ; 555b8 (15:55b8) +Route3AfterBattleText2: TX_FAR _Route3AfterBattleText2 db "@" -Route3Text4: ; 555bd (15:55bd) +Route3Text4: TX_ASM ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route3BattleText3: ; 555c7 (15:55c7) +Route3BattleText3: TX_FAR _Route3BattleText3 db "@" -Route3EndBattleText3: ; 555cc (15:55cc) +Route3EndBattleText3: TX_FAR _Route3EndBattleText3 db "@" -Route3AfterBattleText3: ; 555d1 (15:55d1) +Route3AfterBattleText3: TX_FAR _Route3AfterBattleText3 db "@" -Route3Text5: ; 555d6 (15:55d6) +Route3Text5: TX_ASM ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route3BattleText4: ; 555e0 (15:55e0) +Route3BattleText4: TX_FAR _Route3BattleText4 db "@" -Route3EndBattleText4: ; 555e5 (15:55e5) +Route3EndBattleText4: TX_FAR _Route3EndBattleText4 db "@" -Route3AfterBattleText4: ; 555ea (15:55ea) +Route3AfterBattleText4: TX_FAR _Route3AfterBattleText4 db "@" -Route3Text6: ; 555ef (15:55ef) +Route3Text6: TX_ASM ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route3BattleText5: ; 555f9 (15:55f9) +Route3BattleText5: TX_FAR _Route3BattleText5 db "@" -Route3EndBattleText5: ; 555fe (15:55fe) +Route3EndBattleText5: TX_FAR _Route3EndBattleText5 db "@" -Route3AfterBattleText5: ; 55603 (15:5603) +Route3AfterBattleText5: TX_FAR _Route3AfterBattleText5 db "@" -Route3Text7: ; 55608 (15:5608) +Route3Text7: TX_ASM ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route3BattleText6: ; 55612 (15:5612) +Route3BattleText6: TX_FAR _Route3BattleText6 db "@" -Route3EndBattleText6: ; 55617 (15:5617) +Route3EndBattleText6: TX_FAR _Route3EndBattleText6 db "@" -Route3AfterBattleText6: ; 5561c (15:561c) +Route3AfterBattleText6: TX_FAR _Route3AfterBattleText6 db "@" -Route3Text8: ; 55621 (15:5621) +Route3Text8: TX_ASM ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route3BattleText7: ; 5562b (15:562b) +Route3BattleText7: TX_FAR _Route3BattleText7 db "@" -Route3EndBattleText7: ; 55630 (15:5630) +Route3EndBattleText7: TX_FAR _Route3EndBattleText7 db "@" -Route3AfterBattleText7: ; 55635 (15:5635) +Route3AfterBattleText7: TX_FAR _Route3AfterBattleText7 db "@" -Route3Text9: ; 5563a (15:563a) +Route3Text9: TX_ASM ld hl, Route3TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route3BattleText8: ; 55644 (15:5644) +Route3BattleText8: TX_FAR _Route3BattleText8 db "@" -Route3EndBattleText8: ; 55649 (15:5649) +Route3EndBattleText8: TX_FAR _Route3EndBattleText8 db "@" -Route3AfterBattleText8: ; 5564e (15:564e) +Route3AfterBattleText8: TX_FAR _Route3AfterBattleText8 db "@" -Route3Text10: ; 55653 (15:5653) +Route3Text10: TX_FAR _Route3Text10 db "@" |