The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)

This commit is contained in:
Rangi 2021-04-13 18:24:37 -04:00 committed by GitHub
parent 2954013da1
commit 506a14084e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 274 additions and 149 deletions

View file

@ -4,7 +4,7 @@ SaffronGym_Script:
res 6, [hl]
call nz, .LoadNames
call EnableAutoTextBoxDrawing
ld hl, SaffronGymTrainerHeader0
ld hl, SaffronGymTrainerHeaders
ld de, SaffronGym_ScriptPointers
ld a, [wSaffronGymCurScript]
call ExecuteCurMapScriptInTable
@ -84,6 +84,8 @@ SaffronGym_TextPointers:
dw SaffronGymText11
dw SaffronGymText12
SaffronGymTrainerHeaders:
def_trainers 2
SaffronGymTrainerHeader0:
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymBattleText1, SaffronGymEndBattleText1, SaffronGymAfterBattleText1
SaffronGymTrainerHeader1:
@ -97,7 +99,7 @@ SaffronGymTrainerHeader4:
SaffronGymTrainerHeader5:
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymBattleText6, SaffronGymEndBattleText6, SaffronGymAfterBattleText6
SaffronGymTrainerHeader6:
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
db -1 ; end
SaffronGymText1: