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/AgathasRoom.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/AgathasRoom.asm')
| -rwxr-xr-x | scripts/AgathasRoom.asm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index b49b2a2b..c8df935e 100755 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -121,15 +121,8 @@ AgathasRoom_TextPointers: dw AgathaDontRunAwayText AgathaTrainerHeader0: - dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - dw AgathaBeforeBattleText ; TextBeforeBattle - dw AgathaAfterBattleText ; TextAfterBattle - dw AgathaEndBattleText ; TextEndBattle - dw AgathaEndBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText + db -1 ; end AgathaText1: text_asm |