diff options
| author | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
| commit | 3af309e80584a0e2567586613f406883118d88e3 (patch) | |
| tree | 9204f1351993e4679ad9ef91aa82ad1ebb4b8c4c /scripts/PokemonMansion2F.asm | |
| parent | Trim extra newlines from some files (diff) | |
| parent | The 'def_trainers' macro checks that trainers' event flag bits are correct (#... (diff) | |
| download | pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.gz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.xz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PokemonMansion2F.asm')
| -rw-r--r-- | scripts/PokemonMansion2F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index 2edd0fb6..a887913a 100644 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,7 +1,7 @@ PokemonMansion2F_Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeader0 + ld hl, Mansion2TrainerHeaders ld de, PokemonMansion2F_ScriptPointers ld a, [wPokemonMansion2FCurScript] call ExecuteCurMapScriptInTable @@ -63,6 +63,8 @@ PokemonMansion2F_TextPointers: dw Mansion2Text4 dw Mansion2Text5 +Mansion2TrainerHeaders: + def_trainers Mansion2TrainerHeader0: trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, Mansion2BattleText1, Mansion2EndBattleText1, Mansion2AfterBattleText1 db -1 ; end |