diff options
author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
---|---|---|
committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-22 10:24:00 -0500 |
commit | c34156c5fb333864c1ae85036ea587c9f615a65a (patch) | |
tree | 70a98bceda2ec783da896bf3eb4efd1b0861c2a3 /engine/hidden_object_functions18.asm | |
parent | a6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff) | |
parent | dcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff) |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'engine/hidden_object_functions18.asm')
-rwxr-xr-x | engine/hidden_object_functions18.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index e293b0a0..00744c5d 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -152,8 +152,7 @@ CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df) SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) TX_ASM - ld a, [wd838] - bit 7, a + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SaffronCityPokecenterBenchGuyText2 jr nz, .asm_624f2 ld hl, SaffronCityPokecenterBenchGuyText1 |