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/PewterGym.asm | |
| parent | aa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff) | |
| parent | 93d0697f37aca8ed7a21298a980876af6d43268b (diff) | |
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'scripts/PewterGym.asm')
| -rwxr-xr-x | scripts/PewterGym.asm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 94364043..fd9e9063 100755 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -61,9 +61,9 @@ PewterGymScript_5c3df: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 0, [hl] + set BIT_BOULDERBADGE, [hl] ld hl, wBeatGymFlags - set 0, [hl] + set BIT_BOULDERBADGE, [hl] ld a, HS_GYM_GUY ld [wMissableObjectIndex], a @@ -88,15 +88,8 @@ PewterGym_TextPointers: dw PewterGymText6 PewterGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 - db ($5 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0 - dw PewterGymBattleText1 ; TextBeforeBattle - dw PewterGymAfterBattleText1 ; TextAfterBattle - dw PewterGymEndBattleText1 ; TextEndBattle - dw PewterGymEndBattleText1 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1 + db -1 ; end PewterGymText1: text_asm @@ -183,7 +176,7 @@ PewterGymAfterBattleText1: PewterGymText3: text_asm ld a, [wBeatGymFlags] - bit 0, a + bit BIT_BOULDERBADGE, a jr nz, .asm_5c50c ld hl, PewterGymText_5c515 call PrintText |