diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 08:25:31 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 08:26:16 -0400 |
| commit | e44ad103a332fc07403fbc346266a35de9914132 (patch) | |
| tree | 97a5cc133c650e9904f7a284c0bc686a1e8c0a32 /scripts | |
| parent | 1f4f4b99a83406f3078ad639d2c81da32468d463 (diff) | |
Name Yellow-specific event flags in Pallet and Vermilion
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/pallettown.asm | 6 | ||||
| -rwxr-xr-x | scripts/vermilioncity2.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 131ecaea..147cbdb6 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -26,11 +26,11 @@ PalletTownScript0: ; 18e81 (6:4e81) ld a, [wYCoord] cp 0 ; is player at north exit? ret nz - ResetEvent EVENT_005 + ResetEvent EVENT_PLAYER_AT_RIGHT_EXIT_TO_PALLET_TOWN ld a, [wXCoord] cp 10 jr z, .asm_18e40 - SetEventReuseHL EVENT_005 + SetEventReuseHL EVENT_PLAYER_AT_RIGHT_EXIT_TO_PALLET_TOWN .asm_18e40 xor a ld [hJoyHeld], a @@ -121,7 +121,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ld [wJoyIgnore], a ld a, $2 ld [wSpriteStateData1 + 1 * $10 + 1], a - CheckEvent EVENT_005 + CheckEvent EVENT_PLAYER_AT_RIGHT_EXIT_TO_PALLET_TOWN ld a, SPRITE_FACING_RIGHT jr z, .asm_18f01 ld a, SPRITE_FACING_LEFT diff --git a/scripts/vermilioncity2.asm b/scripts/vermilioncity2.asm index 7eee7b1f..4be44db0 100755 --- a/scripts/vermilioncity2.asm +++ b/scripts/vermilioncity2.asm @@ -1,5 +1,5 @@ Func_f1a0f: - CheckEvent EVENT_147 + CheckEvent EVENT_GOT_SQUIRTLE_FROM_OFFICER_JENNY jr nz, .asm_f1a69 ld a, [wBeatGymFlags] bit 2, a ; THUNDERBADGE @@ -31,7 +31,7 @@ Func_f1a0f: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OfficerJennyText3 call PrintText - SetEvent EVENT_147 + SetEvent EVENT_GOT_SQUIRTLE_FROM_OFFICER_JENNY ret .asm_f1a62 |