diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 10:21:18 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 13:32:09 -0400 |
| commit | f37cf959c930ae9595f9f71ce0d9b17dcf5421d0 (patch) | |
| tree | 33cc0d34fec73e972f4fb040b8b31f59b7e69805 /scripts | |
| parent | aa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff) | |
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CeladonGym.asm | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanGym.asm | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarGym.asm | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaGym.asm | 4 | ||||
| -rwxr-xr-x | scripts/PewterGym.asm | 6 | ||||
| -rwxr-xr-x | scripts/SaffronGym.asm | 4 | ||||
| -rwxr-xr-x | scripts/VermilionGym.asm | 6 | ||||
| -rwxr-xr-x | scripts/ViridianGym.asm | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 21ba65d9..cecd6bf7 100755 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -61,9 +61,9 @@ CeladonGymText_48963: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 3, [hl] + set BIT_RAINBOWBADGE, [hl] ld hl, wBeatGymFlags - set 3, [hl] + set BIT_RAINBOWBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index ef3c96f5..fef3f551 100755 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -61,9 +61,9 @@ CeruleanGymScript_5c70d: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 1, [hl] + set BIT_CASCADEBADGE, [hl] ld hl, wBeatGymFlags - set 1, [hl] + set BIT_CASCADEBADGE, [hl] ; deactivate gym trainers SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 9318c775..552f2e6e 100755 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -158,9 +158,9 @@ CinnabarGymScript3_75857: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 6, [hl] + set BIT_VOLCANOBADGE, [hl] ld hl, wBeatGymFlags - set 6, [hl] + set BIT_VOLCANOBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index ccde6106..944e3070 100755 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -61,9 +61,9 @@ FuchsiaGymScript3_75497: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 4, [hl] + set BIT_SOULBADGE, [hl] ld hl, wBeatGymFlags - set 4, [hl] + set BIT_SOULBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 94364043..e559db04 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 @@ -183,7 +183,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 diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 5f4045ac..a6baa45f 100755 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -61,9 +61,9 @@ SaffronGymText_5d068: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 5, [hl] + set BIT_MARSHBADGE, [hl] ld hl, wBeatGymFlags - set 5, [hl] + set BIT_MARSHBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 45b200e2..53ea0218 100755 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -80,9 +80,9 @@ VermilionGymReceiveTM24: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 2, [hl] + set BIT_THUNDERBADGE, [hl] ld hl, wBeatGymFlags - set 2, [hl] + set BIT_THUNDERBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2 @@ -247,7 +247,7 @@ VermilionGymAfterBattleText3: VermilionGymFanText: text_asm ld a, [wBeatGymFlags] - bit 2, a + bit BIT_THUNDERBADGE, a jr nz, .afterBeat ld hl, VermilionGymFanPreBattleText call PrintText diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 80f19f3a..5d9b7ca0 100755 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -155,9 +155,9 @@ ViridianGymScript3_74995: call DisplayTextID .gymVictory ld hl, wObtainedBadges - set 7, [hl] + set BIT_EARTHBADGE, [hl] ld hl, wBeatGymFlags - set 7, [hl] + set BIT_EARTHBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 |