named most of the used events

This commit is contained in:
YamaArashi 2015-07-21 10:36:03 -07:00
parent cbcdb2ec2a
commit 73171bfff5
90 changed files with 485 additions and 468 deletions

View file

@ -152,7 +152,7 @@ CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df)
SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4)
TX_ASM
CheckEvent EVENT_78F
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2
ld hl, SaffronCityPokecenterBenchGuyText1

View file

@ -322,11 +322,11 @@ BillsHousePC: ; 1eb6e (7:6b6e)
ld a, [wSpriteStateData1 + 9]
cp SPRITE_FACING_UP
ret nz
CheckEvent EVENT_55F
CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
jr nz, .asm_1ebd2
CheckEventReuseA EVENT_55B
CheckEventReuseA EVENT_USED_CELL_SEPARATOR_ON_BILL
jr nz, .asm_1eb86
CheckEventReuseA EVENT_55E
CheckEventReuseA EVENT_BILL_SAID_USE_CELL_SEPARATOR
jr nz, .asm_1eb8b
.asm_1eb86
tx_pre_jump BillsHouseMonitorText
@ -355,7 +355,7 @@ BillsHousePC: ; 1eb6e (7:6b6e)
call PlaySound
call WaitForSoundToFinish
call PlayDefaultMusic
SetEvent EVENT_55B
SetEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
ret
.asm_1ebd2
ld a, $1

View file

@ -432,7 +432,7 @@ ItemUseBall: ; d687 (3:5687)
call ClearSprites
call SendNewMonToBox
ld hl,ItemUseBallText07
CheckEvent EVENT_550
CheckEvent EVENT_MET_BILL
jr nz,.sendToBox2
ld hl,ItemUseBallText08
.sendToBox2

View file

@ -28,7 +28,7 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
call UpdateSprites
ld a, 3
ld [wMaxMenuItem], a
CheckEvent EVENT_550
CheckEvent EVENT_MET_BILL
jr nz, .metBill
coord hl, 2, 2
ld de, SomeonesPCText

View file

@ -74,7 +74,7 @@ BillsPC: ; 17ee4 (5:7ee4)
ld a, SFX_ENTER_PC
call PlaySound
call WaitForSoundToFinish
CheckEvent EVENT_550
CheckEvent EVENT_MET_BILL
jr nz, .billsPC ;if you've met bill, use that bill's instead of someone's
ld hl, AccessedSomeonesPCText
jr .printText

View file

@ -65,7 +65,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006)
callba RemoveItemByID
ld hl, LabFossil_610b8
call PrintText
SetEvents EVENT_2E0, EVENT_2E1
SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL
ret
.asm_610a7
ld hl, LabFossil_610bd