diff options
Diffstat (limited to 'scripts/route9.asm')
| -rwxr-xr-x | scripts/route9.asm | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/scripts/route9.asm b/scripts/route9.asm index 5776d4e6..c965d853 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -1,6 +1,6 @@ Route9Script: call EnableAutoTextBoxDrawing - ld hl, Route9TrainerHeaders + ld hl, Route9TrainerHeader0 ld de, Route9ScriptPointers ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route9TextPointers: dw PickUpItemText dw Route9Text11 -Route9TrainerHeaders: Route9TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -35,73 +34,73 @@ Route9TrainerHeader0: dw Route9EndBattleText1 ; TextEndBattle dw Route9EndBattleText1 ; TextEndBattle -Route9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 +Route9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 dw Route9BattleText2 ; TextBeforeBattle dw Route9AfterBattleText2 ; TextAfterBattle dw Route9EndBattleText2 ; TextEndBattle dw Route9EndBattleText2 ; TextEndBattle -Route9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 +Route9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 dw Route9BattleText3 ; TextBeforeBattle dw Route9AfterBattleText3 ; TextAfterBattle dw Route9EndBattleText3 ; TextEndBattle dw Route9EndBattleText3 ; TextEndBattle -Route9TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 +Route9TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 dw Route9BattleText4 ; TextBeforeBattle dw Route9AfterBattleText4 ; TextAfterBattle dw Route9EndBattleText4 ; TextEndBattle dw Route9EndBattleText4 ; TextEndBattle -Route9TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 +Route9TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 dw Route9BattleText5 ; TextBeforeBattle dw Route9AfterBattleText5 ; TextAfterBattle dw Route9EndBattleText5 ; TextEndBattle dw Route9EndBattleText5 ; TextEndBattle -Route9TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 +Route9TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 dw Route9BattleText6 ; TextBeforeBattle dw Route9AfterBattleText6 ; TextAfterBattle dw Route9EndBattleText6 ; TextEndBattle dw Route9EndBattleText6 ; TextEndBattle -Route9TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7 +Route9TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 dw Route9BattleText7 ; TextBeforeBattle dw Route9AfterBattleText7 ; TextAfterBattle dw Route9EndBattleText7 ; TextEndBattle dw Route9EndBattleText7 ; TextEndBattle -Route9TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 +Route9TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 dw Route9BattleText8 ; TextBeforeBattle dw Route9AfterBattleText8 ; TextAfterBattle dw Route9EndBattleText8 ; TextEndBattle dw Route9EndBattleText8 ; TextEndBattle -Route9TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1 +Route9TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 dw Route9BattleText9 ; TextBeforeBattle dw Route9AfterBattleText9 ; TextAfterBattle dw Route9EndBattleText9 ; TextEndBattle @@ -116,42 +115,42 @@ Route9Text1: Route9Text2: TX_ASM - ld hl, Route9TrainerHeader2 + ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer Route9Text3: TX_ASM - ld hl, Route9TrainerHeader3 + ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer Route9Text4: TX_ASM - ld hl, Route9TrainerHeader4 + ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer Route9Text5: TX_ASM - ld hl, Route9TrainerHeader5 + ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer Route9Text6: TX_ASM - ld hl, Route9TrainerHeader6 + ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer Route9Text7: TX_ASM - ld hl, Route9TrainerHeader7 + ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer Route9Text8: TX_ASM - ld hl, Route9TrainerHeader8 + ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer Route9Text9: TX_ASM - ld hl, Route9TrainerHeader9 + ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd |