diff options
Diffstat (limited to 'scripts/route18.asm')
| -rwxr-xr-x | scripts/route18.asm | 93 |
1 files changed, 46 insertions, 47 deletions
diff --git a/scripts/route18.asm b/scripts/route18.asm index de2fe19a..687b269c 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -1,112 +1,111 @@ -Route18Script: ; 59ac7 (16:5ac7) +Route18Script: call EnableAutoTextBoxDrawing - ld hl, Route18TrainerHeaders + ld hl, Route18TrainerHeader0 ld de, Route18ScriptPointers - ld a, [W_ROUTE18CURSCRIPT] + ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE18CURSCRIPT], a + 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) - db $1 ; flag's bit +Route18TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range - dw wd7e3 ; flag's byte - dw Route18BattleText1 ; 0x5b19 TextBeforeBattle - dw Route18AfterBattleText1 ; 0x5b23 TextAfterBattle - dw Route18EndBattleText1 ; 0x5b1e TextEndBattle - dw Route18EndBattleText1 ; 0x5b1e TextEndBattle - -Route18TrainerHeader1: ; 59af6 (16:5af6) - db $2 ; flag's bit + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 + dw Route18BattleText1 ; TextBeforeBattle + dw Route18AfterBattleText1 ; TextAfterBattle + dw Route18EndBattleText1 ; TextEndBattle + dw Route18EndBattleText1 ; TextEndBattle + +Route18TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 db ($3 << 4) ; trainer's view range - dw wd7e3 ; flag's byte - dw Route18BattleText2 ; 0x5b32 TextBeforeBattle - dw Route18AfterBattleText2 ; 0x5b3c TextAfterBattle - dw Route18EndBattleText2 ; 0x5b37 TextEndBattle - dw Route18EndBattleText2 ; 0x5b37 TextEndBattle - -Route18TrainerHeader2: ; 59b02 (16:5b02) - db $3 ; flag's bit + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 + dw Route18BattleText2 ; TextBeforeBattle + dw Route18AfterBattleText2 ; TextAfterBattle + dw Route18EndBattleText2 ; TextEndBattle + dw Route18EndBattleText2 ; TextEndBattle + +Route18TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 db ($4 << 4) ; trainer's view range - dw wd7e3 ; flag's byte - dw Route18BattleText3 ; 0x5b4b TextBeforeBattle - dw Route18AfterBattleText3 ; 0x5b55 TextAfterBattle - dw Route18EndBattleText3 ; 0x5b50 TextEndBattle - dw Route18EndBattleText3 ; 0x5b50 TextEndBattle + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 + dw Route18BattleText3 ; TextBeforeBattle + dw Route18AfterBattleText3 ; TextAfterBattle + dw Route18EndBattleText3 ; TextEndBattle + dw Route18EndBattleText3 ; TextEndBattle db $ff -Route18Text1: ; 59b0f (16:5b0f) - db $08 ; asm +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) - db $08 ; asm +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) - db $08 ; asm +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 "@" |