Merge pull request #107 from YamaArashi/master

enumerate events
This commit is contained in:
Daniel Harding 2015-07-22 10:24:00 -05:00
commit c34156c5fb
139 changed files with 4178 additions and 1703 deletions

View file

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

View file

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