summaryrefslogtreecommitdiff
path: root/scripts/pewtercity.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-22 10:24:00 -0500
commitc34156c5fb333864c1ae85036ea587c9f615a65a (patch)
tree70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /scripts/pewtercity.asm
parenta6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff)
parentdcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff)
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'scripts/pewtercity.asm')
-rwxr-xr-xscripts/pewtercity.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm
index 94d23caa..77da14f8 100755
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -16,14 +16,12 @@ PewterCityScriptPointers: ; 19243 (6:5243)
PewterCityScript0: ; 19251 (6:5251)
xor a
ld [W_MUSEUM1FCURSCRIPT], a
- ld hl, wd754
- res 0, [hl]
+ ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
call PewterCityScript_1925e
ret
PewterCityScript_1925e: ; 1925e (6:525e)
- ld a, [wd755]
- bit 7, a
+ CheckEvent EVENT_BEAT_BROCK
ret nz
ld hl, CoordsData_19277
call ArePlayerCoordsInArray