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/route9.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/route9.asm')
-rwxr-xr-x | scripts/route9.asm | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/scripts/route9.asm b/scripts/route9.asm index 6656cc8a..5776d4e6 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -1,4 +1,4 @@ -Route9Script: ; 556bc (15:56bc) +Route9Script: call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeaders ld de, Route9ScriptPointers @@ -7,12 +7,12 @@ Route9Script: ; 556bc (15:56bc) ld [wRoute9CurScript], a ret -Route9ScriptPointers: ; 556cf (15:56cf) +Route9ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route9TextPointers: ; 556d5 (15:56d5) +Route9TextPointers: dw Route9Text1 dw Route9Text2 dw Route9Text3 @@ -25,8 +25,8 @@ Route9TextPointers: ; 556d5 (15:56d5) dw PickUpItemText dw Route9Text11 -Route9TrainerHeaders: ; 556eb (15:56eb) -Route9TrainerHeader0: ; 556eb (15:56eb) +Route9TrainerHeaders: +Route9TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0 @@ -35,7 +35,7 @@ Route9TrainerHeader0: ; 556eb (15:56eb) dw Route9EndBattleText1 ; TextEndBattle dw Route9EndBattleText1 ; TextEndBattle -Route9TrainerHeader2: ; 556f7 (15:56f7) +Route9TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 @@ -44,7 +44,7 @@ Route9TrainerHeader2: ; 556f7 (15:56f7) dw Route9EndBattleText2 ; TextEndBattle dw Route9EndBattleText2 ; TextEndBattle -Route9TrainerHeader3: ; 55703 (15:5703) +Route9TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 @@ -53,7 +53,7 @@ Route9TrainerHeader3: ; 55703 (15:5703) dw Route9EndBattleText3 ; TextEndBattle dw Route9EndBattleText3 ; TextEndBattle -Route9TrainerHeader4: ; 5570f (15:570f) +Route9TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 @@ -62,7 +62,7 @@ Route9TrainerHeader4: ; 5570f (15:570f) dw Route9EndBattleText4 ; TextEndBattle dw Route9EndBattleText4 ; TextEndBattle -Route9TrainerHeader5: ; 5571b (15:571b) +Route9TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 @@ -71,7 +71,7 @@ Route9TrainerHeader5: ; 5571b (15:571b) dw Route9EndBattleText5 ; TextEndBattle dw Route9EndBattleText5 ; TextEndBattle -Route9TrainerHeader6: ; 55727 (15:5727) +Route9TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 @@ -80,7 +80,7 @@ Route9TrainerHeader6: ; 55727 (15:5727) dw Route9EndBattleText6 ; TextEndBattle dw Route9EndBattleText6 ; TextEndBattle -Route9TrainerHeader7: ; 55733 (15:5733) +Route9TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7 @@ -89,7 +89,7 @@ Route9TrainerHeader7: ; 55733 (15:5733) dw Route9EndBattleText7 ; TextEndBattle dw Route9EndBattleText7 ; TextEndBattle -Route9TrainerHeader8: ; 5573f (15:573f) +Route9TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 @@ -98,7 +98,7 @@ Route9TrainerHeader8: ; 5573f (15:573f) dw Route9EndBattleText8 ; TextEndBattle dw Route9EndBattleText8 ; TextEndBattle -Route9TrainerHeader9: ; 5574b (15:574b) +Route9TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1 @@ -109,161 +109,161 @@ Route9TrainerHeader9: ; 5574b (15:574b) db $ff -Route9Text1: ; 55758 (15:5758) +Route9Text1: TX_ASM ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer -Route9Text2: ; 5575e (15:575e) +Route9Text2: TX_ASM ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer -Route9Text3: ; 55764 (15:5764) +Route9Text3: TX_ASM ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer -Route9Text4: ; 5576a (15:576a) +Route9Text4: TX_ASM ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer -Route9Text5: ; 55770 (15:5770) +Route9Text5: TX_ASM ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer -Route9Text6: ; 55776 (15:5776) +Route9Text6: TX_ASM ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer -Route9Text7: ; 5577c (15:577c) +Route9Text7: TX_ASM ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer -Route9Text8: ; 55782 (15:5782) +Route9Text8: TX_ASM ld hl, Route9TrainerHeader8 jr Route9TalkToTrainer -Route9Text9: ; 55788 (15:5788) +Route9Text9: TX_ASM ld hl, Route9TrainerHeader9 -Route9TalkToTrainer: ; 5578c (15:578c) +Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route9BattleText1: ; 55792 (15:5792) +Route9BattleText1: TX_FAR _Route9BattleText1 db "@" -Route9EndBattleText1: ; 55797 (15:5797) +Route9EndBattleText1: TX_FAR _Route9EndBattleText1 db "@" -Route9AfterBattleText1: ; 5579c (15:579c) +Route9AfterBattleText1: TX_FAR _Route9AfterBattleText1 db "@" -Route9BattleText2: ; 557a1 (15:57a1) +Route9BattleText2: TX_FAR _Route9BattleText2 db "@" -Route9EndBattleText2: ; 557a6 (15:57a6) +Route9EndBattleText2: TX_FAR _Route9EndBattleText2 db "@" -Route9AfterBattleText2: ; 557ab (15:57ab) +Route9AfterBattleText2: TX_FAR _Route9AfterBattleText2 db "@" -Route9BattleText3: ; 557b0 (15:57b0) +Route9BattleText3: TX_FAR _Route9BattleText3 db "@" -Route9EndBattleText3: ; 557b5 (15:57b5) +Route9EndBattleText3: TX_FAR _Route9EndBattleText3 db "@" -Route9AfterBattleText3: ; 557ba (15:57ba) +Route9AfterBattleText3: TX_FAR _Route9AfterBattleText3 db "@" -Route9BattleText4: ; 557bf (15:57bf) +Route9BattleText4: TX_FAR _Route9BattleText4 db "@" -Route9EndBattleText4: ; 557c4 (15:57c4) +Route9EndBattleText4: TX_FAR _Route9EndBattleText4 db "@" -Route9AfterBattleText4: ; 557c9 (15:57c9) +Route9AfterBattleText4: TX_FAR _Route9AfterBattleText4 db "@" -Route9BattleText5: ; 557ce (15:57ce) +Route9BattleText5: TX_FAR _Route9BattleText5 db "@" -Route9EndBattleText5: ; 557d3 (15:57d3) +Route9EndBattleText5: TX_FAR _Route9EndBattleText5 db "@" -Route9AfterBattleText5: ; 557d8 (15:57d8) +Route9AfterBattleText5: TX_FAR _Route9AfterBattleText5 db "@" -Route9BattleText6: ; 557dd (15:57dd) +Route9BattleText6: TX_FAR _Route9BattleText6 db "@" -Route9EndBattleText6: ; 557e2 (15:57e2) +Route9EndBattleText6: TX_FAR _Route9EndBattleText6 db "@" -Route9AfterBattleText6: ; 557e7 (15:57e7) +Route9AfterBattleText6: TX_FAR _Route9AfterBattleText6 db "@" -Route9BattleText7: ; 557ec (15:57ec) +Route9BattleText7: TX_FAR _Route9BattleText7 db "@" -Route9EndBattleText7: ; 557f1 (15:57f1) +Route9EndBattleText7: TX_FAR _Route9EndBattleText7 db "@" -Route9AfterBattleText7: ; 557f6 (15:57f6) +Route9AfterBattleText7: TX_FAR _Route9AfterBattleText7 db "@" -Route9BattleText8: ; 557fb (15:57fb) +Route9BattleText8: TX_FAR _Route9BattleText8 db "@" -Route9EndBattleText8: ; 55800 (15:5800) +Route9EndBattleText8: TX_FAR _Route9EndBattleText8 db "@" -Route9AfterBattleText8: ; 55805 (15:5805) +Route9AfterBattleText8: TX_FAR _Route9AfterBattleText8 db "@" -Route9BattleText9: ; 5580a (15:580a) +Route9BattleText9: TX_FAR _Route9BattleText9 db "@" -Route9EndBattleText9: ; 5580f (15:580f) +Route9EndBattleText9: TX_FAR _Route9EndBattleText9 db "@" -Route9AfterBattleText9: ; 55814 (15:5814) +Route9AfterBattleText9: TX_FAR _Route9AfterBattleText9 db "@" -Route9Text11: ; 55819 (15:5819) +Route9Text11: TX_FAR _Route9Text11 db "@" |