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 | |
| parent | 1f4f4b99a83406f3078ad639d2c81da32468d463 (diff) | |
Name Yellow-specific event flags in Pallet and Vermilion
| -rw-r--r-- | constants/event_constants.asm | 4 | ||||
| -rwxr-xr-x | scripts/pallettown.asm | 6 | ||||
| -rwxr-xr-x | scripts/vermilioncity2.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index f284c967..491f8664 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -5,7 +5,7 @@ const_value = 0 const EVENT_002 ; 002, (D747, bit 2) const EVENT_HALL_OF_FAME_DEX_RATING ; 003, (D747, bit 3) const EVENT_004 ; 004, (D747, bit 4) - const EVENT_005 ; 005, (D747, bit 5) + const EVENT_PLAYER_AT_RIGHT_EXIT_TO_PALLET_TOWN ; 005, (D747, bit 5) const EVENT_PALLET_AFTER_GETTING_POKEBALLS ; 006, (D747, bit 6) const EVENT_007 ; 007, (D747, bit 7) const EVENT_008 ; 008, (D748, bit 0) @@ -327,7 +327,7 @@ const_value = 0 const EVENT_144 ; 144, (D76F, bit 4) const EVENT_145 ; 145, (D76F, bit 5) const EVENT_146 ; 146, (D76F, bit 6) - const EVENT_147 ; 147, (D76F, bit 7) + const EVENT_GOT_SQUIRTLE_FROM_OFFICER_JENNY ; 147, (D76F, bit 7) const EVENT_148 ; 148, (D770, bit 0) const EVENT_149 ; 149, (D770, bit 1) const EVENT_14A ; 14A, (D770, bit 2) 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 |