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 | |
| parent | c7e3aed0b86b1a06151a38db914135255b760118 (diff) | |
| parent | a49ca6ef4153c16f5f5f1f968cc704e07b669d96 (diff) | |
Merge pull request #268 from Rangi42/master
Factor out MapBadgeFlags and EscapeRopeTilesets data tables
| -rw-r--r-- | data/maps/badge_maps.asm | 10 | ||||
| -rw-r--r-- | data/tilesets/escape_rope_tilesets.asm | 3 | ||||
| -rw-r--r-- | engine/events/hidden_objects/gym_statues.asm | 13 | ||||
| -rwxr-xr-x | engine/items/item_effects.asm | 4 |
4 files changed, 16 insertions, 14 deletions
diff --git a/data/maps/badge_maps.asm b/data/maps/badge_maps.asm new file mode 100644 index 00000000..81d95757 --- /dev/null +++ b/data/maps/badge_maps.asm @@ -0,0 +1,10 @@ +MapBadgeFlags: + 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 diff --git a/data/tilesets/escape_rope_tilesets.asm b/data/tilesets/escape_rope_tilesets.asm new file mode 100644 index 00000000..6acf8e77 --- /dev/null +++ b/data/tilesets/escape_rope_tilesets.asm @@ -0,0 +1,3 @@ +EscapeRopeTilesets: + db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR + db $ff ; terminator 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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index b04f11fb..a8ff1e06 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1525,9 +1525,7 @@ ItemUseEscapeRope: .notUsable jp ItemUseNotTime -EscapeRopeTilesets: - db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR - db $ff ; terminator +INCLUDE "data/tilesets/escape_rope_tilesets.asm" ItemUseRepel: ld b, 100 |