summaryrefslogtreecommitdiff
path: root/scripts/lab4.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
committerYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
commit73171bfff573fa8900563319c014f3e626db6b3e (patch)
tree402ca266578eb759a30f52e05b031bad93d45ee6 /scripts/lab4.asm
parentcbcdb2ec2a013beba4f321988e393419a8eed10e (diff)
named most of the used events
Diffstat (limited to 'scripts/lab4.asm')
-rwxr-xr-xscripts/lab4.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lab4.asm b/scripts/lab4.asm
index 44dcb2c3..f2c4d8d7 100755
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -49,7 +49,7 @@ FossilsList: ; 75d68 (1d:5d68)
Lab4Text1: ; 75d6c (1d:5d6c)
TX_ASM
- CheckEvent EVENT_2E0
+ CheckEvent EVENT_GAVE_FOSSIL_TO_LAB
jr nz, .asm_75d96
ld hl, Lab4Text_75dc6
call PrintText
@@ -65,7 +65,7 @@ Lab4Text1: ; 75d6c (1d:5d6c)
.asm_75d93
jp TextScriptEnd
.asm_75d96
- bit 1, a
+ CheckEventAfterBranchReuseA EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_GAVE_FOSSIL_TO_LAB
jr z, .asm_75da2
ld hl, Lab4Text_75dd0
call PrintText
@@ -74,13 +74,13 @@ Lab4Text1: ; 75d6c (1d:5d6c)
call LoadFossilItemAndMonNameBank1D
ld hl, Lab4Text_75dd5
call PrintText
- SetEvent EVENT_2E2
+ SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON
ld a, [W_FOSSILMON]
ld b, a
ld c, 30
call GivePokemon
jr nc, .asm_75d93
- ResetEvents EVENT_2E0, EVENT_2E1, EVENT_2E2
+ ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON
jr .asm_75d93
Lab4Text_75dc6: ; 75dc6 (1d:5dc6)