thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #268 from Rangi42/master

Browse source 
Factor out MapBadgeFlags and EscapeRopeTilesets data tables
This commit is contained in:
Rangi 2020-07-08 10:59:12 -04:00 committed by GitHub
parent c7e3aed0b8 a49ca6ef41
commit 54d76dec38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/maps/badge_maps.asm Normal file
View file

@ -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

3
data/tilesets/escape_rope_tilesets.asm Normal file
View file

@ -0,0 +1,3 @@
EscapeRopeTilesets:
db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR
db $ff ; terminator

13
engine/events/hidden_objects/gym_statues.asm
View file

@ -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

4
engine/items/item_effects.asm
View file

@ -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