diff options
Diffstat (limited to 'data/maps/toggleable_objects.asm')
| -rw-r--r-- | data/maps/toggleable_objects.asm | 61 |
1 files changed, 38 insertions, 23 deletions
diff --git a/data/maps/toggleable_objects.asm b/data/maps/toggleable_objects.asm index 90f9e689..c628bd88 100644 --- a/data/maps/toggleable_objects.asm +++ b/data/maps/toggleable_objects.asm @@ -48,6 +48,7 @@ ToggleableObjectStates: toggleable_objects_for VIRIDIAN_CITY toggle_object_state VIRIDIANCITY_OLD_MAN_SLEEPY, ON toggle_object_state VIRIDIANCITY_OLD_MAN, OFF + toggle_object_state VIRIDIANCITY_OLD_MAN2, OFF toggleable_objects_for PEWTER_CITY toggle_object_state PEWTERCITY_SUPER_NERD1, ON @@ -75,7 +76,7 @@ ToggleableObjectStates: toggle_object_state SAFFRONCITY_PIDGEOT, OFF toggle_object_state SAFFRONCITY_ROCKER, OFF toggle_object_state SAFFRONCITY_ROCKET8, ON - toggle_object_state SAFFRONCITY_ROCKET9, OFF + toggle_object_state SAFFRONCITY_ROCKET9, OFF ; removed in yellow toggleable_objects_for ROUTE_2 toggle_object_state ROUTE2_MOON_STONE, ON @@ -115,14 +116,12 @@ ToggleableObjectStates: toggle_object_state BLUESHOUSE_TOWN_MAP, ON toggleable_objects_for OAKS_LAB - toggle_object_state OAKSLAB_RIVAL, ON - toggle_object_state OAKSLAB_CHARMANDER_POKE_BALL, ON - toggle_object_state OAKSLAB_SQUIRTLE_POKE_BALL, ON - toggle_object_state OAKSLAB_BULBASAUR_POKE_BALL, ON - toggle_object_state OAKSLAB_OAK1, OFF - toggle_object_state OAKSLAB_POKEDEX1, ON - toggle_object_state OAKSLAB_POKEDEX2, ON - toggle_object_state OAKSLAB_OAK2, OFF + toggle_object_state OAKSLAB_RIVAL, ON + toggle_object_state OAKSLAB_EEVEE_POKE_BALL, ON + toggle_object_state OAKSLAB_OAK1, OFF + toggle_object_state OAKSLAB_POKEDEX1, ON + toggle_object_state OAKSLAB_POKEDEX2, ON + toggle_object_state OAKSLAB_OAK2, OFF toggleable_objects_for VIRIDIAN_GYM toggle_object_state VIRIDIANGYM_GIOVANNI, ON @@ -131,10 +130,14 @@ ToggleableObjectStates: toggleable_objects_for MUSEUM_1F toggle_object_state MUSEUM1F_OLD_AMBER, ON + toggleable_objects_for CERULEAN_MELANIES_HOUSE + toggle_object_state CERULEANMELANIESHOUSE_BULBASAUR, ON + toggleable_objects_for CERULEAN_CAVE_1F - toggle_object_state CERULEANCAVE1F_FULL_RESTORE, ON - toggle_object_state CERULEANCAVE1F_MAX_ELIXER, ON - toggle_object_state CERULEANCAVE1F_NUGGET, ON + toggle_object_state CERULEANCAVE1F_RARE_CANDY, ON + toggle_object_state CERULEANCAVE1F_MAX_ELIXER, ON + toggle_object_state CERULEANCAVE1F_MAX_REVIVE, ON + toggle_object_state CERULEANCAVE1F_ULTRA_BALL, ON toggleable_objects_for POKEMON_TOWER_2F toggle_object_state POKEMONTOWER2F_RIVAL, ON @@ -155,9 +158,8 @@ ToggleableObjectStates: toggle_object_state POKEMONTOWER6F_X_ACCURACY, ON toggleable_objects_for POKEMON_TOWER_7F - toggle_object_state POKEMONTOWER7F_ROCKET1, ON - toggle_object_state POKEMONTOWER7F_ROCKET2, ON - toggle_object_state POKEMONTOWER7F_ROCKET3, ON + toggle_object_state POKEMONTOWER7F_JESSIE, OFF + toggle_object_state POKEMONTOWER7F_JAMES, OFF toggle_object_state POKEMONTOWER7F_MR_FUJI, ON toggleable_objects_for MR_FUJIS_HOUSE @@ -213,8 +215,8 @@ ToggleableObjectStates: toggle_object_state BILLSHOUSE_BILL2, OFF toggleable_objects_for VIRIDIAN_FOREST - toggle_object_state VIRIDIANFOREST_ANTIDOTE, ON - toggle_object_state VIRIDIANFOREST_POTION, ON + toggle_object_state VIRIDIANFOREST_POTION1, ON + toggle_object_state VIRIDIANFOREST_POTION2, ON toggle_object_state VIRIDIANFOREST_POKE_BALL, ON toggleable_objects_for MT_MOON_1F @@ -226,6 +228,8 @@ ToggleableObjectStates: toggle_object_state MTMOON1F_TM_WATER_GUN, ON toggleable_objects_for MT_MOON_B2F + toggle_object_state MTMOONB2F_JESSIE, OFF + toggle_object_state MTMOONB2F_JAMES, OFF toggle_object_state MTMOONB2F_DOME_FOSSIL, ON toggle_object_state MTMOONB2F_HELIX_FOSSIL, ON toggle_object_state MTMOONB2F_HP_UP, ON @@ -267,6 +271,8 @@ ToggleableObjectStates: toggleable_objects_for ROCKET_HIDEOUT_B4F toggle_object_state ROCKETHIDEOUTB4F_GIOVANNI, ON + toggle_object_state ROCKETHIDEOUTB4F_JAMES, OFF + toggle_object_state ROCKETHIDEOUTB4F_JESSIE, OFF toggle_object_state ROCKETHIDEOUTB4F_HP_UP, ON toggle_object_state ROCKETHIDEOUTB4F_TM_RAZOR_WIND, ON toggle_object_state ROCKETHIDEOUTB4F_IRON, ON @@ -339,8 +345,9 @@ ToggleableObjectStates: toggleable_objects_for SILPH_CO_11F toggle_object_state SILPHCO11F_GIOVANNI, ON - toggle_object_state SILPHCO11F_ROCKET1, ON - toggle_object_state SILPHCO11F_ROCKET2, ON + toggle_object_state SILPHCO11F_JAMES, ON + toggle_object_state SILPHCO11F_ROCKET, ON + toggle_object_state SILPHCO11F_JESSIE, ON toggleable_objects_for UNUSED_MAP_F4 toggle_object_state $02, ON ; unused @@ -379,14 +386,17 @@ ToggleableObjectStates: toggle_object_state SAFARIZONECENTER_NUGGET, ON toggleable_objects_for CERULEAN_CAVE_2F - toggle_object_state CERULEANCAVE2F_PP_UP, ON + toggle_object_state CERULEANCAVE2F_RARE_CANDY, ON toggle_object_state CERULEANCAVE2F_ULTRA_BALL, ON + toggle_object_state CERULEANCAVE2F_MAX_REVIVE, ON toggle_object_state CERULEANCAVE2F_FULL_RESTORE, ON toggleable_objects_for CERULEAN_CAVE_B1F - toggle_object_state CERULEANCAVEB1F_MEWTWO, ON - toggle_object_state CERULEANCAVEB1F_ULTRA_BALL, ON - toggle_object_state CERULEANCAVEB1F_MAX_REVIVE, ON + toggle_object_state CERULEANCAVEB1F_MEWTWO, ON + toggle_object_state CERULEANCAVEB1F_ULTRA_BALL1, ON + toggle_object_state CERULEANCAVEB1F_ULTRA_BALL2, ON + toggle_object_state CERULEANCAVEB1F_MAX_REVIVE, ON + toggle_object_state CERULEANCAVEB1F_MAX_ELIXER, ON toggleable_objects_for VICTORY_ROAD_1F toggle_object_state VICTORYROAD1F_TM_SKY_ATTACK, ON @@ -418,6 +428,11 @@ ToggleableObjectStates: toggle_object_state SEAFOAMISLANDSB4F_BOULDER2, OFF toggle_object_state SEAFOAMISLANDSB4F_ARTICUNO, ON +; unreferenced + db BLUES_HOUSE, BLUESHOUSE_DAISY1, ON + db BLUES_HOUSE, BLUESHOUSE_DAISY2, OFF + db BLUES_HOUSE, BLUESHOUSE_TOWN_MAP, ON + assert_table_length NUM_TOGGLEABLE_OBJECTS db -1, 1, ON ; end |