From 72790bcbacc7405fe8d94d57c98adc45e0812705 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 6 Apr 2016 20:58:45 -0600 Subject: =?UTF-8?q?Clean=20up=20labels=20and=20trainer=20headers=20for=20o?= =?UTF-8?q?verworld=20Pok=C3=A9mon.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/unknowndungeon3.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'scripts/unknowndungeon3.asm') diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index c5818032..2790694b 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,42 +1,42 @@ -UnknownDungeon3Script: ; 45ef0 (11:5ef0) +UnknownDungeon3Script: call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders - ld de, UnknownDungeon3ScriptPointers + ld de, .ScriptPointers ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable ld [wUnknownDungeon3CurScript], a ret -UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) +.ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -UnknownDungeon3TextPointers: ; 45f09 (11:5f09) - dw UnknownDungeon3Text1 +UnknownDungeon3TextPointers: + dw MewtwoText dw PickUpItemText dw PickUpItemText -UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) -UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) - dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 +UnknownDungeon3TrainerHeaders: +MewtwoTrainerHeader: + dbEventFlagBit EVENT_BEAT_MEWTWO db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 - dw UnknownDungeon3MewtwoText ; TextBeforeBattle - dw UnknownDungeon3MewtwoText ; TextAfterBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_MEWTWO + dw MewtwoBattleText ; TextBeforeBattle + dw MewtwoBattleText ; TextAfterBattle + dw MewtwoBattleText ; TextEndBattle + dw MewtwoBattleText ; TextEndBattle db $ff -UnknownDungeon3Text1: ; 45f1c (11:5f1c) +MewtwoText: TX_ASM - ld hl, UnknownDungeon3TrainerHeader0 + ld hl, MewtwoTrainerHeader call TalkToTrainer jp TextScriptEnd -UnknownDungeon3MewtwoText: ; 45f26 (11:5f26) - TX_FAR _UnknownDungeon3MewtwoText +MewtwoBattleText: + TX_FAR _MewtwoBattleText TX_ASM ld a, MEWTWO call PlayCry -- cgit v1.2.3