diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-04-13 18:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 18:24:37 -0400 |
| commit | 506a14084e32d7532b8400a6457f46492bbc47ab (patch) | |
| tree | 60ce89cfa9dc1158c5e8a8353ef96fba810c929c /scripts/RockTunnelB1F.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/RockTunnelB1F.asm')
| -rw-r--r-- | scripts/RockTunnelB1F.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm index 9cba9c3e..fa9cafda 100644 --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm @@ -1,6 +1,6 @@ RockTunnelB1F_Script: call EnableAutoTextBoxDrawing - ld hl, RockTunnel2TrainerHeader0 + ld hl, RockTunnel2TrainerHeaders ld de, RockTunnelB1F_ScriptPointers ld a, [wRockTunnelB1FCurScript] call ExecuteCurMapScriptInTable @@ -22,6 +22,8 @@ RockTunnelB1F_TextPointers: dw RockTunnel2Text7 dw RockTunnel2Text8 +RockTunnel2TrainerHeaders: + def_trainers RockTunnel2TrainerHeader0: trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnel2BattleText2, RockTunnel2EndBattleText2, RockTunnel2AfterBattleText2 RockTunnel2TrainerHeader1: @@ -37,7 +39,7 @@ RockTunnel2TrainerHeader5: RockTunnel2TrainerHeader6: trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnel2BattleText8, RockTunnel2EndBattleText8, RockTunnel2AfterBattleText8 RockTunnel2TrainerHeader7: - trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9 + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9 db -1 ; end RockTunnel2Text1: |