summaryrefslogtreecommitdiff
path: root/scripts/RocketHideoutB2F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 15:45:36 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 15:53:25 -0400
commit5c0f33cb5350d3e11bd75cc04d943549667ecd4c (patch)
tree2d5927ab83072b0673793269eacd14e6b5fd5ad2 /scripts/RocketHideoutB2F.asm
parentbe326c65652d5e87e353172a4471458822ffd3da (diff)
Use a 'trainer' macro for trainers in scripts/
Diffstat (limited to 'scripts/RocketHideoutB2F.asm')
-rwxr-xr-xscripts/RocketHideoutB2F.asm11
1 files changed, 2 insertions, 9 deletions
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