diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-15 12:26:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 12:26:16 -0400 |
| commit | e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch) | |
| tree | d8a157ae5aa323a00873efe79eb4693327b8bb70 /scripts/PokemonMansion2F.asm | |
| parent | Merge pull request #269 from Rangi42/master (diff) | |
| parent | Don't compare strings with ==; use STRCMP (diff) | |
| download | pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip | |
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'scripts/PokemonMansion2F.asm')
| -rwxr-xr-x | scripts/PokemonMansion2F.asm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index 16f0dff5..2edd0fb6 100755 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -64,15 +64,8 @@ PokemonMansion2F_TextPointers: dw Mansion2Text5 Mansion2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 - dw Mansion2BattleText1 ; TextBeforeBattle - dw Mansion2AfterBattleText1 ; TextAfterBattle - dw Mansion2EndBattleText1 ; TextEndBattle - dw Mansion2EndBattleText1 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, Mansion2BattleText1, Mansion2EndBattleText1, Mansion2AfterBattleText1 + db -1 ; end Mansion2Text1: text_asm |