diff options
Diffstat (limited to 'scripts/route13.asm')
| -rwxr-xr-x | scripts/route13.asm | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/scripts/route13.asm b/scripts/route13.asm index 61f43ee9..54fb9d68 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -1,6 +1,6 @@ Route13Script: call EnableAutoTextBoxDrawing - ld hl, Route13TrainerHeaders + ld hl, Route13TrainerHeader0 ld de, Route13ScriptPointers ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable @@ -27,7 +27,6 @@ Route13TextPointers: dw Route13Text12 dw Route13Text13 -Route13TrainerHeaders: Route13TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -37,82 +36,82 @@ Route13TrainerHeader0: dw Route13EndBattleText2 ; TextEndBattle dw Route13EndBattleText2 ; TextEndBattle -Route13TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 +Route13TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 dw Route13BattleText3 ; TextBeforeBattle dw Route13AfterBattleText3 ; TextAfterBattle dw Route13EndBattleText3 ; TextEndBattle dw Route13EndBattleText3 ; TextEndBattle -Route13TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 +Route13TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 dw Route13BattleText4 ; TextBeforeBattle dw Route13AfterBattleText4 ; TextAfterBattle dw Route13EndBattleText4 ; TextEndBattle dw Route13EndBattleText4 ; TextEndBattle -Route13TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 +Route13TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 dw Route13BattleText5 ; TextBeforeBattle dw Route13AfterBattleText5 ; TextAfterBattle dw Route13EndBattleText5 ; TextEndBattle dw Route13EndBattleText5 ; TextEndBattle -Route13TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 +Route13TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 dw Route13BattleText6 ; TextBeforeBattle dw Route13AfterBattleText6 ; TextAfterBattle dw Route13EndBattleText6 ; TextEndBattle dw Route13EndBattleText6 ; TextEndBattle -Route13TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 +Route13TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 dw Route13BattleText7 ; TextBeforeBattle dw Route13AfterBattleText7 ; TextAfterBattle dw Route13EndBattleText7 ; TextEndBattle dw Route13EndBattleText7 ; TextEndBattle -Route13TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7 +Route13TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 dw Route13BattleText8 ; TextBeforeBattle dw Route13AfterBattleText8 ; TextAfterBattle dw Route13EndBattleText8 ; TextEndBattle dw Route13EndBattleText8 ; TextEndBattle -Route13TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 +Route13TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 dw Route13BattleText9 ; TextBeforeBattle dw Route13AfterBattleText9 ; TextAfterBattle dw Route13EndBattleText9 ; TextEndBattle dw Route13EndBattleText9 ; TextEndBattle -Route13TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 +Route13TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 dw Route13BattleText10 ; TextBeforeBattle dw Route13AfterBattleText10 ; TextAfterBattle dw Route13EndBattleText10 ; TextEndBattle dw Route13EndBattleText10 ; TextEndBattle -Route13TrainerHeader10: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1 +Route13TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 dw Route13BattleText11 ; TextBeforeBattle dw Route13AfterBattleText11 ; TextAfterBattle dw Route13EndBattleText11 ; TextEndBattle @@ -140,7 +139,7 @@ Route13AfterBattleText2: Route13Text2: TX_ASM - ld hl, Route13TrainerHeader2 + ld hl, Route13TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -158,7 +157,7 @@ Route13AfterBattleText3: Route13Text3: TX_ASM - ld hl, Route13TrainerHeader3 + ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -176,7 +175,7 @@ Route13AfterBattleText4: Route13Text4: TX_ASM - ld hl, Route13TrainerHeader4 + ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -194,7 +193,7 @@ Route13AfterBattleText5: Route13Text5: TX_ASM - ld hl, Route13TrainerHeader5 + ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -212,7 +211,7 @@ Route13AfterBattleText6: Route13Text6: TX_ASM - ld hl, Route13TrainerHeader6 + ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -230,7 +229,7 @@ Route13AfterBattleText7: Route13Text7: TX_ASM - ld hl, Route13TrainerHeader7 + ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd @@ -248,7 +247,7 @@ Route13AfterBattleText8: Route13Text8: TX_ASM - ld hl, Route13TrainerHeader8 + ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd @@ -266,7 +265,7 @@ Route13AfterBattleText9: Route13Text9: TX_ASM - ld hl, Route13TrainerHeader9 + ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd @@ -284,7 +283,7 @@ Route13AfterBattleText10: Route13Text10: TX_ASM - ld hl, Route13TrainerHeader10 + ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd |