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/PokemonMansion3F.asm | |
parent | 3ce276892c1b97ae893d319125b13fed936d14f2 (diff) | |
parent | 506a14084e32d7532b8400a6457f46492bbc47ab (diff) |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PokemonMansion3F.asm')
-rw-r--r-- | scripts/PokemonMansion3F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 0f62d6e0..2fc7c18d 100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -1,7 +1,7 @@ PokemonMansion3F_Script: call Mansion3Script_52204 call EnableAutoTextBoxDrawing - ld hl, Mansion3TrainerHeader0 + ld hl, Mansion3TrainerHeaders ld de, PokemonMansion3F_ScriptPointers ld a, [wPokemonMansion3FCurScript] call ExecuteCurMapScriptInTable @@ -90,6 +90,8 @@ PokemonMansion3F_TextPointers: dw Mansion3Text5 dw Mansion3Text6 +Mansion3TrainerHeaders: + def_trainers Mansion3TrainerHeader0: trainer EVENT_BEAT_MANSION_3_TRAINER_0, 0, Mansion3BattleText1, Mansion3EndBattleText1, Mansion3AfterBattleText1 Mansion3TrainerHeader1: |