diff options
Diffstat (limited to 'scripts/pokemontower3.asm')
| -rwxr-xr-x | scripts/pokemontower3.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 0c3c6639..8be15c9e 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3Script: ; 606cc (18:46cc) +PokemonTower3Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeaders ld de, PokemonTower3ScriptPointers @@ -7,19 +7,19 @@ PokemonTower3Script: ; 606cc (18:46cc) ld [wPokemonTower3CurScript], a ret -PokemonTower3ScriptPointers: ; 606df (18:46df) +PokemonTower3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower3TextPointers: ; 606e5 (18:46e5) +PokemonTower3TextPointers: dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 dw PickUpItemText -PokemonTower3TrainerHeaders: ; 606ed (18:46ed) -PokemonTower3TrainerHeader0: ; 606ed (18:46ed) +PokemonTower3TrainerHeaders: +PokemonTower3TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 @@ -28,7 +28,7 @@ PokemonTower3TrainerHeader0: ; 606ed (18:46ed) dw PokemonTower3EndBattleText1 ; TextEndBattle dw PokemonTower3EndBattleText1 ; TextEndBattle -PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) +PokemonTower3TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 @@ -37,7 +37,7 @@ PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) dw PokemonTower3EndBattleText2 ; TextEndBattle dw PokemonTower3EndBattleText2 ; TextEndBattle -PokemonTower3TrainerHeader2: ; 60705 (18:4705) +PokemonTower3TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 @@ -47,56 +47,56 @@ PokemonTower3TrainerHeader2: ; 60705 (18:4705) dw PokemonTower3EndBattleText3 ; TextEndBattle db $ff -PokemonTower3Text1: ; 60712 (18:4712) +PokemonTower3Text1: TX_ASM ld hl, PokemonTower3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text2: ; 6071c (18:471c) +PokemonTower3Text2: TX_ASM ld hl, PokemonTower3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text3: ; 60726 (18:4726) +PokemonTower3Text3: TX_ASM ld hl, PokemonTower3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower3BattleText1: ; 60730 (18:4730) +PokemonTower3BattleText1: TX_FAR _PokemonTower3BattleText1 db "@" -PokemonTower3EndBattleText1: ; 60735 (18:4735) +PokemonTower3EndBattleText1: TX_FAR _PokemonTower3EndBattleText1 db "@" -PokemonTower3AfterBattleText1: ; 6073a (18:473a) +PokemonTower3AfterBattleText1: TX_FAR _PokemonTower3AfterBattleText1 db "@" -PokemonTower3BattleText2: ; 6073f (18:473f) +PokemonTower3BattleText2: TX_FAR _PokemonTower3BattleText2 db "@" -PokemonTower3EndBattleText2: ; 60744 (18:4744) +PokemonTower3EndBattleText2: TX_FAR _PokemonTower3EndBattleText2 db "@" -PokemonTower3AfterBattleText2: ; 60749 (18:4749) +PokemonTower3AfterBattleText2: TX_FAR _PokemonTower3AfterBattleText2 db "@" -PokemonTower3BattleText3: ; 6074e (18:474e) +PokemonTower3BattleText3: TX_FAR _PokemonTower3BattleText3 db "@" -PokemonTower3EndBattleText3: ; 60753 (18:4753) +PokemonTower3EndBattleText3: TX_FAR _PokemonTower3EndBattleText3 db "@" -PokemonTower3AfterBattleText3: ; 60758 (18:4758) +PokemonTower3AfterBattleText3: TX_FAR _PokemonTower3AfterBattleText3 db "@" |