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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
| -rw-r--r-- | scripts/PokemonMansionB1F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index f3b62793..4ca84624 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,7 +1,7 @@ PokemonMansionB1F_Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing - ld hl, Mansion4TrainerHeader0 + ld hl, Mansion4TrainerHeaders ld de, PokemonMansionB1F_ScriptPointers ld a, [wPokemonMansionB1FCurScript] call ExecuteCurMapScriptInTable @@ -69,6 +69,8 @@ PokemonMansionB1F_TextPointers: dw PickUpItemText dw Mansion3Text6 +Mansion4TrainerHeaders: + def_trainers Mansion4TrainerHeader0: trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, Mansion4BattleText1, Mansion4EndBattleText1, Mansion4AfterBattleText1 Mansion4TrainerHeader1: |