diff options
Diffstat (limited to 'scripts/ssanne5.asm')
| -rwxr-xr-x | scripts/ssanne5.asm | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 96b94c52..0cfef9f4 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -1,89 +1,88 @@ -SSAnne5Script: ; 616ae (18:56ae) +SSAnne5Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne5TrainerHeader0 ; $56d1 + ld hl, SSAnne5TrainerHeader0 ld de, SSAnne5ScriptPointers - ld a, [W_SSANNE5CURSCRIPT] + ld a, [wSSAnne5CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE5CURSCRIPT], a + ld [wSSAnne5CurScript], a ret -SSAnne5ScriptPointers: ; 616c1 (18:56c1) +SSAnne5ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne5TextPointers: ; 616c7 (18:56c7) +SSAnne5TextPointers: dw SSAnne5Text1 dw SSAnne5Text2 dw SSAnne5Text3 dw SSAnne5Text4 dw SSAnne5Text5 -SSAnne5TrainerHeaders: ; 616d1 (18:56d1) -SSAnne5TrainerHeader0: ; 616d1 (18:56d1) - db $4 ; flag's bit +SSAnne5TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 db ($3 << 4) ; trainer's view range - dw wd7ff ; flag's byte - dw SSAnne5BattleText1 ; 0x5703 TextBeforeBattle - dw SSAnne5AfterBattleText1 ; 0x570d TextAfterBattle - dw SSAnne5EndBattleText1 ; 0x5708 TextEndBattle - dw SSAnne5EndBattleText1 ; 0x5708 TextEndBattle - -SSAnne5TrainerHeader1: ; 616dd (18:56dd) - db $5 ; flag's bit + dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0 + dw SSAnne5BattleText1 ; TextBeforeBattle + dw SSAnne5AfterBattleText1 ; TextAfterBattle + dw SSAnne5EndBattleText1 ; TextEndBattle + dw SSAnne5EndBattleText1 ; TextEndBattle + +SSAnne5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1 db ($3 << 4) ; trainer's view range - dw wd7ff ; flag's byte - dw SSAnne5BattleText2 ; 0x571c TextBeforeBattle - dw SSAnne5AfterBattleText2 ; 0x5726 TextAfterBattle - dw SSAnne5EndBattleText2 ; 0x5721 TextEndBattle - dw SSAnne5EndBattleText2 ; 0x5721 TextEndBattle + dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1 + dw SSAnne5BattleText2 ; TextBeforeBattle + dw SSAnne5AfterBattleText2 ; TextAfterBattle + dw SSAnne5EndBattleText2 ; TextEndBattle + dw SSAnne5EndBattleText2 ; TextEndBattle db $ff -SSAnne5Text1: ; 616ea (18:56ea) +SSAnne5Text1: TX_FAR _SSAnne5Text1 db "@" -SSAnne5Text2: ; 616ef (18:56ef) +SSAnne5Text2: TX_FAR _SSAnne5Text2 db "@" -SSAnne5Text3: ; 616f4 (18:56f4) +SSAnne5Text3: TX_FAR _SSAnne5Text3 db "@" -SSAnne5Text4: ; 616f9 (18:56f9) - db $08 ; asm +SSAnne5Text4: + TX_ASM ld hl, SSAnne5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText1: ; 61703 (18:5703) +SSAnne5BattleText1: TX_FAR _SSAnne5BattleText1 db "@" -SSAnne5EndBattleText1: ; 61708 (18:5708) +SSAnne5EndBattleText1: TX_FAR _SSAnne5EndBattleText1 db "@" -SSAnne5AfterBattleText1: ; 6170d (18:570d) +SSAnne5AfterBattleText1: TX_FAR _SSAnne5AfterBattleText1 db "@" -SSAnne5Text5: ; 61712 (18:5712) - db $08 ; asm +SSAnne5Text5: + TX_ASM ld hl, SSAnne5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText2: ; 6171c (18:571c) +SSAnne5BattleText2: TX_FAR _SSAnne5BattleText2 db "@" -SSAnne5EndBattleText2: ; 61721 (18:5721) +SSAnne5EndBattleText2: TX_FAR _SSAnne5EndBattleText2 db "@" -SSAnne5AfterBattleText2: ; 61726 (18:5726) +SSAnne5AfterBattleText2: TX_FAR _SSAnne5AfterBattleText2 db "@" |