diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 15:45:36 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 15:53:25 -0400 |
| commit | 5c0f33cb5350d3e11bd75cc04d943549667ecd4c (patch) | |
| tree | 2d5927ab83072b0673793269eacd14e6b5fd5ad2 /scripts/PokemonMansion1F.asm | |
| parent | Factor out spinner tiles from RocketHideoutB2F since they're also used by Vir... (diff) | |
| download | pokeyellow-5c0f33cb5350d3e11bd75cc04d943549667ecd4c.tar.gz pokeyellow-5c0f33cb5350d3e11bd75cc04d943549667ecd4c.tar.xz pokeyellow-5c0f33cb5350d3e11bd75cc04d943549667ecd4c.zip | |
Use a 'trainer' macro for trainers in scripts/
Diffstat (limited to 'scripts/PokemonMansion1F.asm')
| -rwxr-xr-x | scripts/PokemonMansion1F.asm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index a68b8928..ac86d626 100755 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -67,15 +67,8 @@ PokemonMansion1F_TextPointers: dw Mansion1Text4 Mansion1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0 - dw Mansion1BattleText2 ; TextBeforeBattle - dw Mansion1AfterBattleText2 ; TextAfterBattle - dw Mansion1EndBattleText2 ; TextEndBattle - dw Mansion1EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2 + db -1 ; end Mansion1Text1: text_asm |