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/route18.asm | |
| parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
| parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) | |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/route18.asm')
| -rwxr-xr-x | scripts/route18.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/scripts/route18.asm b/scripts/route18.asm index dcd4b5ee..b89e2613 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -1,4 +1,4 @@ -Route18Script: ; 59ac7 (16:5ac7) +Route18Script: call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeaders ld de, Route18ScriptPointers @@ -7,20 +7,20 @@ Route18Script: ; 59ac7 (16:5ac7) ld [wRoute18CurScript], a ret -Route18ScriptPointers: ; 59ada (16:5ada) +Route18ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route18TextPointers: ; 59ae0 (16:5ae0) +Route18TextPointers: dw Route18Text1 dw Route18Text2 dw Route18Text3 dw Route18Text4 dw Route18Text5 -Route18TrainerHeaders: ; 59aea (16:5aea) -Route18TrainerHeader0: ; 59aea (16:5aea) +Route18TrainerHeaders: +Route18TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 @@ -29,7 +29,7 @@ Route18TrainerHeader0: ; 59aea (16:5aea) dw Route18EndBattleText1 ; TextEndBattle dw Route18EndBattleText1 ; TextEndBattle -Route18TrainerHeader1: ; 59af6 (16:5af6) +Route18TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 @@ -38,7 +38,7 @@ Route18TrainerHeader1: ; 59af6 (16:5af6) dw Route18EndBattleText2 ; TextEndBattle dw Route18EndBattleText2 ; TextEndBattle -Route18TrainerHeader2: ; 59b02 (16:5b02) +Route18TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 @@ -49,64 +49,64 @@ Route18TrainerHeader2: ; 59b02 (16:5b02) db $ff -Route18Text1: ; 59b0f (16:5b0f) +Route18Text1: TX_ASM ld hl, Route18TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route18BattleText1: ; 59b19 (16:5b19) +Route18BattleText1: TX_FAR _Route18BattleText1 db "@" -Route18EndBattleText1: ; 59b1e (16:5b1e) +Route18EndBattleText1: TX_FAR _Route18EndBattleText1 db "@" -Route18AfterBattleText1: ; 59b23 (16:5b23) +Route18AfterBattleText1: TX_FAR _Route18AfterBattleText1 db "@" -Route18Text2: ; 59b28 (16:5b28) +Route18Text2: TX_ASM ld hl, Route18TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route18BattleText2: ; 59b32 (16:5b32) +Route18BattleText2: TX_FAR _Route18BattleText2 db "@" -Route18EndBattleText2: ; 59b37 (16:5b37) +Route18EndBattleText2: TX_FAR _Route18EndBattleText2 db "@" -Route18AfterBattleText2: ; 59b3c (16:5b3c) +Route18AfterBattleText2: TX_FAR _Route18AfterBattleText2 db "@" -Route18Text3: ; 59b41 (16:5b41) +Route18Text3: TX_ASM ld hl, Route18TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route18BattleText3: ; 59b4b (16:5b4b) +Route18BattleText3: TX_FAR _Route18BattleText3 db "@" -Route18EndBattleText3: ; 59b50 (16:5b50) +Route18EndBattleText3: TX_FAR _Route18EndBattleText3 db "@" -Route18AfterBattleText3: ; 59b55 (16:5b55) +Route18AfterBattleText3: TX_FAR _Route18AfterBattleText3 db "@" -Route18Text4: ; 59b5a (16:5b5a) +Route18Text4: TX_FAR _Route18Text4 db "@" -Route18Text5: ; 59b5f (16:5b5f) +Route18Text5: TX_FAR _Route18Text5 db "@" |