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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rw-r--r-- | scripts/PokemonMansion1F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index ac86d626..247562a9 100644 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,7 +1,7 @@ PokemonMansion1F_Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing - ld hl, Mansion1TrainerHeader0 + ld hl, Mansion1TrainerHeaders ld de, PokemonMansion1F_ScriptPointers ld a, [wPokemonMansion1FCurScript] call ExecuteCurMapScriptInTable @@ -66,6 +66,8 @@ PokemonMansion1F_TextPointers: dw PickUpItemText dw Mansion1Text4 +Mansion1TrainerHeaders: + def_trainers Mansion1TrainerHeader0: trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2 db -1 ; end |