thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-07 08:05:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
scripts/ViridianGym.asm
View file

@ -3,7 +3,7 @@ ViridianGym_Script:
ld de, .LeaderName
call LoadGymLeaderAndCityName
call EnableAutoTextBoxDrawing
ld hl, ViridianGymTrainerHeader0
ld hl, ViridianGymTrainerHeaders
ld de, ViridianGym_ScriptPointers
ld a, [wViridianGymCurScript]
call ExecuteCurMapScriptInTable
@ -181,6 +181,8 @@ ViridianGym_TextPointers:
dw ViridianGymText13
dw ViridianGymText14
ViridianGymTrainerHeaders:
def_trainers 2
ViridianGymTrainerHeader0:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1
ViridianGymTrainerHeader1:
@ -194,9 +196,9 @@ ViridianGymTrainerHeader4:
ViridianGymTrainerHeader5:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6
ViridianGymTrainerHeader6:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7
ViridianGymTrainerHeader7:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
db -1 ; end
ViridianGymText1: