diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/event_constants.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 1eb68941..4e3a2849 100755 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -3,7 +3,7 @@ const_value = 0 const EVENT_FOLLOWED_OAK_INTO_LAB ; 000, (D747, bit 0) const EVENT_001 ; 001, (D747, bit 1) const EVENT_002 ; 002, (D747, bit 2) - const EVENT_003 ; 003, (D747, bit 3) + 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_PALLET_AFTER_GETTING_POKEBALLS ; 006, (D747, bit 6) @@ -666,13 +666,13 @@ const_value = 0 const EVENT_297 ; 297, (D799, bit 7) const EVENT_GOT_TM38 ; 298, (D79A, bit 0) const EVENT_BEAT_BLAINE ; 299, (D79A, bit 1) - const EVENT_29A ; 29A, (D79A, bit 2) - const EVENT_29B ; 29B, (D79A, bit 3) - const EVENT_29C ; 29C, (D79A, bit 4) - const EVENT_29D ; 29D, (D79A, bit 5) - const EVENT_29E ; 29E, (D79A, bit 6) - const EVENT_29F ; 29F, (D79A, bit 7) - const EVENT_2A0 ; 2A0, (D79B, bit 0) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_0 ; 29A, (D79A, bit 2) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_1 ; 29B, (D79A, bit 3) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_2 ; 29C, (D79A, bit 4) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_3 ; 29D, (D79A, bit 5) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_4 ; 29E, (D79A, bit 6) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_5 ; 29F, (D79A, bit 7) + const EVENT_BEAT_CINNABAR_GYM_TRAINER_6 ; 2A0, (D79B, bit 0) const EVENT_2A1 ; 2A1, (D79B, bit 1) const EVENT_2A2 ; 2A2, (D79B, bit 2) const EVENT_2A3 ; 2A3, (D79B, bit 3) @@ -680,13 +680,13 @@ const_value = 0 const EVENT_2A5 ; 2A5, (D79B, bit 5) const EVENT_2A6 ; 2A6, (D79B, bit 6) const EVENT_2A7 ; 2A7, (D79B, bit 7) - const EVENT_2A8 ; 2A8, (D79C, bit 0) - const EVENT_2A9 ; 2A9, (D79C, bit 1) - const EVENT_2AA ; 2AA, (D79C, bit 2) - const EVENT_2AB ; 2AB, (D79C, bit 3) - const EVENT_2AC ; 2AC, (D79C, bit 4) - const EVENT_2AD ; 2AD, (D79C, bit 5) - const EVENT_2AE ; 2AE, (D79C, bit 6) + const EVENT_CINNABAR_GYM_GATE0_UNLOCKED ; 2A8, (D79C, bit 0) doesn't exist, but the bit is set + const EVENT_CINNABAR_GYM_GATE1_UNLOCKED ; 2A9, (D79C, bit 1) + const EVENT_CINNABAR_GYM_GATE2_UNLOCKED ; 2AA, (D79C, bit 2) + const EVENT_CINNABAR_GYM_GATE3_UNLOCKED ; 2AB, (D79C, bit 3) + const EVENT_CINNABAR_GYM_GATE4_UNLOCKED ; 2AC, (D79C, bit 4) + const EVENT_CINNABAR_GYM_GATE5_UNLOCKED ; 2AD, (D79C, bit 5) + const EVENT_CINNABAR_GYM_GATE6_UNLOCKED ; 2AE, (D79C, bit 6) const EVENT_2AF ; 2AF, (D79C, bit 7) const EVENT_2B0 ; 2B0, (D79D, bit 0) const EVENT_2B1 ; 2B1, (D79D, bit 1) @@ -2272,7 +2272,7 @@ const_value = 0 const EVENT_8DD ; 8DD, (D862, bit 5) const EVENT_8DE ; 8DE, (D862, bit 6) const EVENT_8DF ; 8DF, (D862, bit 7) - const EVENT_ELITE4_EVENTS_START ; 8E0, (D863, bit 0) + const ELITE4_EVENTS_START ; 8E0, (D863, bit 0) const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 ; 8E1, (D863, bit 1) const EVENT_8E2 ; 8E2, (D863, bit 2) const EVENT_8E3 ; 8E3, (D863, bit 3) @@ -2311,7 +2311,7 @@ const_value = 0 const EVENT_904 ; 904, (D867, bit 4) const EVENT_905 ; 905, (D867, bit 5) const EVENT_906 ; 906, (D867, bit 6) - const EVENT_907 ; 907, (D867, bit 7) + const ELITE4_CHAMPION_EVENTS_END ; 907, (D867, bit 7) const EVENT_908 ; 908, (D868, bit 0) const EVENT_909 ; 909, (D868, bit 1) const EVENT_90A ; 90A, (D868, bit 2) |