From 5c0f33cb5350d3e11bd75cc04d943549667ecd4c Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 14 Jul 2020 15:45:36 -0400 Subject: Use a 'trainer' macro for trainers in scripts/ --- scripts/RocketHideoutB2F.asm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scripts/RocketHideoutB2F.asm') diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index c4cda325..85f26c31 100755 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -323,15 +323,8 @@ RocketHideoutB2F_TextPointers: dw PickUpItemText RocketHideout2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - dw RocketHideout2BattleText2 ; TextBeforeBattle - dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideout2BattleText2, RocketHideout2EndBattleText2, RocketHideout2AfterBattleTxt2 + db -1 ; end RocketHideout2Text1: text_asm -- cgit v1.2.3