diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-09-16 22:04:19 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-09-16 22:04:19 -0600 |
| commit | f5ce33c3dc240c7f1f9a1cb894ba041b5692c8bd (patch) | |
| tree | 1c947d315550b36bb5fbfe412a0d8343cf4f47a9 /constants | |
| parent | dee94fd4db2b42510c8763f49830340ccf918ceb (diff) | |
Add all map objects from bank 44.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 16 | ||||
| -rw-r--r-- | constants/event_flags.asm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d41a2528..1b8f2f3d 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -51,14 +51,14 @@ engine_flag_def ENGINE_VOLCANOBADGE, wKantoBadges, 6 ; volcanobadge ; $28 engine_flag_def ENGINE_EARTHBADGE, wKantoBadges, 7 ; earthbadge - engine_flag_def ENGINE_UNLOCKED_UNOWNS_1, wUnlockedUnowns, 0 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_2, wUnlockedUnowns, 1 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_3, wUnlockedUnowns, 2 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_4, wUnlockedUnowns, 3 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_5, wUnlockedUnowns, 4 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_6, wUnlockedUnowns, 5 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_7, wUnlockedUnowns, 6 ; $30 - engine_flag_def ENGINE_UNLOCKED_UNOWNS_8, wUnlockedUnowns, 7 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_A_TO_K, wUnlockedUnowns, 0 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_L_TO_R, wUnlockedUnowns, 1 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_S_TO_W, wUnlockedUnowns, 2 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_X_TO_Z, wUnlockedUnowns, 3 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_4, wUnlockedUnowns, 4 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_5, wUnlockedUnowns, 5 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_6, wUnlockedUnowns, 6 ; $30 + engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_7, wUnlockedUnowns, 7 engine_flag_def ENGINE_FLYPOINT_KRISS_HOUSE, wVisitedSpawns, 0 ; your house engine_flag_def ENGINE_FLYPOINT_VIRIDIAN_POKECENTER, wVisitedSpawns, 1 ; viridian pokecenter diff --git a/constants/event_flags.asm b/constants/event_flags.asm index f5dcdc10..a0f67d37 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -622,7 +622,7 @@ const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER const EVENT_BEVERLY_READY_FOR_REMATCH const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER - const EVENT_264 + const EVENT_HUEY_READY_FOR_REMATCH const EVENT_GOT_PROTEIN_FROM_HUEY const EVENT_GOT_HP_UP_FROM_JOEY const EVENT_GOT_CARBOS_FROM_VANCE |