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/overworld | |
| parent | a6f04b434980f2176cb275a7c3ba50d5cbcd6ace (diff) | |
| parent | dcc7f3bc9f41f2d5e0f7448b4688c1058da0040b (diff) | |
Merge pull request #107 from YamaArashi/master
enumerate events
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/cable_club_npc.asm | 3 | ||||
| -rwxr-xr-x | engine/overworld/cinnabar_lab.asm | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 2a9b19fe..65837150 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,8 +1,7 @@ CableClubNPC: ; 71c5 (1:71c5) ld hl, CableClubNPCWelcomeText call PrintText - ld a, [wd74b] - bit 5, a ; received pokedex? + CheckEvent EVENT_GOT_POKEDEX jp nz, .receivedPokedex ; if the player hasn't received the pokedex ld c, 60 diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index 18ce23ed..1b96b4c6 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -65,9 +65,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) callba RemoveItemByID ld hl, LabFossil_610b8 call PrintText - ld hl, wd7a3 - set 0, [hl] - set 1, [hl] + SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL ret .asm_610a7 ld hl, LabFossil_610bd |