diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 40 | ||||
| -rw-r--r-- | constants/map_constants.asm | 6 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 13 |
3 files changed, 32 insertions, 27 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 12d5fce1..41010f6b 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -3,13 +3,13 @@ ; These first eight flags are reset upon reloading the map. const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000 - const EVENT_RECEIVED_BALLS_FROM_KURT - const EVENT_DRAGON_SHRINE_QUESTION_2 - const EVENT_DRAGON_SHRINE_QUESTION_3 - const EVENT_DRAGON_SHRINE_QUESTION_4 - const EVENT_DRAGON_SHRINE_QUESTION_5 - const EVENT_JUST_RECEIVED_DRATINI - const EVENT_IN_YOUR_ROOM + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 ; Johto story events const EVENT_GOT_TM31_MUD_SLAP const EVENT_GOT_TM49_FURY_CUTTER @@ -143,11 +143,11 @@ const EVENT_ILEX_FOREST_HIDDEN_ETHER const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL - const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL - const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION - const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE - const EVENT_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION - const EVENT_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE + const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL + const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION + const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE + const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION + const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE @@ -1717,9 +1717,9 @@ const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL const EVENT_ILEX_FOREST_REVIVE - const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE - const EVENT_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - const EVENT_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL + const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE + const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL @@ -1797,7 +1797,7 @@ const EVENT_RIVAL_CHERRYGROVE_CITY const EVENT_RIVAL_AZALEA_TOWN const EVENT_RIVAL_TEAM_ROCKET_BASE - const EVENT_RIVAL_UNDERGROUND + const EVENT_RIVAL_GOLDENROD_UNDERGROUND const EVENT_RIVAL_VICTORY_ROAD const EVENT_RIVAL_OLIVINE_CITY const EVENT_RIVAL_SPROUT_TOWER @@ -1942,10 +1942,10 @@ const EVENT_OPENED_MT_SILVER const EVENT_FOUGHT_SNORLAX ; 750 const EVENT_LAKE_OF_RAGE_RED_GYARADOS - const EVENT_WAREHOUSE_ENTRANCE_GRANNY - const EVENT_WAREHOUSE_ENTRANCE_GRAMPS - const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER - const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + const EVENT_GOLDENROD_UNDERGROUND_GRANNY + const EVENT_GOLDENROD_UNDERGROUND_GRAMPS + const EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER + const EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c41643c8..1d74fd4c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -101,10 +101,10 @@ ENDM map_const TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 map_const TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 map_const ILEX_FOREST, 27, 15 ; 52 - map_const WAREHOUSE_ENTRANCE, 18, 15 ; 53 - map_const UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54 + map_const GOLDENROD_UNDERGROUND, 18, 15 ; 53 + map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES,18, 15 ; 54 map_const GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55 - map_const UNDERGROUND_WAREHOUSE, 9, 10 ; 56 + map_const GOLDENROD_UNDERGROUND_WAREHOUSE, 9, 10 ; 56 map_const MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57 map_const MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58 map_const MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 74d27aab..8f996cfb 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -41,10 +41,15 @@ FACE_LEFT EQU 2 FACE_RIGHT EQU 1 ; TimeOfDay: ; d269 -MORN EQU 0 -DAY EQU 1 -NITE EQU 2 -DARKNESS EQU 3 +MORN_F EQU 0 +DAY_F EQU 1 +NITE_F EQU 2 +DARKNESS_F EQU 3 + +MORN EQU 1 << MORN_F +DAY EQU 1 << DAY_F +NITE EQU 1 << NITE_F +DARKNESS EQU 1 << DARKNESS_F ; ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 |