diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-08 10:59:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 10:59:12 -0400 |
| commit | 54d76dec388a70260aad6ef6acb94a5b9f95fd6d (patch) | |
| tree | a7f74a4335dc30dc1823699d7e2d7316783b6094 /engine/events | |
| parent | Get all unnamed symbols with make DEBUG=1 (diff) | |
| parent | Factor out MapBadgeFlags and EscapeRopeTilesets data tables (diff) | |
| download | pokeyellow-54d76dec388a70260aad6ef6acb94a5b9f95fd6d.tar.gz pokeyellow-54d76dec388a70260aad6ef6acb94a5b9f95fd6d.tar.xz pokeyellow-54d76dec388a70260aad6ef6acb94a5b9f95fd6d.zip | |
Merge pull request #268 from Rangi42/master
Factor out MapBadgeFlags and EscapeRopeTilesets data tables
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/hidden_objects/gym_statues.asm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/engine/events/hidden_objects/gym_statues.asm b/engine/events/hidden_objects/gym_statues.asm index 97b01a3a..1c7eb970 100644 --- a/engine/events/hidden_objects/gym_statues.asm +++ b/engine/events/hidden_objects/gym_statues.asm @@ -6,7 +6,7 @@ GymStatues: ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz - ld hl, .BadgeFlags + ld hl, MapBadgeFlags ld a, [wCurMap] ld b, a .loop @@ -28,16 +28,7 @@ GymStatues: .haveBadge jp PrintPredefTextID -.BadgeFlags: - db PEWTER_GYM, %00000001 - db CERULEAN_GYM, %00000010 - db VERMILION_GYM,%00000100 - db CELADON_GYM, %00001000 - db FUCHSIA_GYM, %00010000 - db SAFFRON_GYM, %00100000 - db CINNABAR_GYM, %01000000 - db VIRIDIAN_GYM, %10000000 - db $ff +INCLUDE "data/maps/badge_maps.asm" GymStatueText1:: text_far _GymStatueText1 |