Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 37 insertions, 37 deletions

diff --git a/main.asm b/main.asm
index a242fcbd..b10fc7e0 100644
--- a/main.asm
+++ b/main.asm
@@ -43,13 +43,13 @@ INCLUDE "engine/overworld/player_state.asm"
 INCLUDE "engine/events/poison.asm"
 INCLUDE "engine/overworld/tilesets.asm"
 INCLUDE "engine/overworld/daycare_exp.asm"
-INCLUDE "data/maps/hide_show_data.asm"
+INCLUDE "data/maps/toggleable_objects.asm"
 INCLUDE "engine/overworld/wild_mons.asm"
 INCLUDE "engine/items/item_effects.asm"
 INCLUDE "engine/menus/draw_badges.asm"
 INCLUDE "engine/overworld/update_map.asm"
 INCLUDE "engine/overworld/cut.asm"
-INCLUDE "engine/overworld/missable_objects.asm"
+INCLUDE "engine/overworld/toggleable_objects.asm"
 INCLUDE "engine/overworld/push_boulder.asm"
 INCLUDE "engine/pokemon/add_mon.asm"
 INCLUDE "engine/flag_action.asm"
@@ -59,12 +59,12 @@ INCLUDE "engine/movie/oak_speech/init_player_data.asm"
 INCLUDE "engine/items/get_bag_item_quantity.asm"
 INCLUDE "engine/overworld/pathfinding.asm"
 INCLUDE "engine/gfx/hp_bar.asm"
-INCLUDE "engine/events/hidden_objects/bookshelves.asm"
-INCLUDE "engine/events/hidden_objects/indigo_plateau_statues.asm"
-INCLUDE "engine/events/hidden_objects/book_or_sculpture.asm"
-INCLUDE "engine/events/hidden_objects/elevator.asm"
-INCLUDE "engine/events/hidden_objects/town_map.asm"
-INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm"
+INCLUDE "engine/events/hidden_events/bookshelves.asm"
+INCLUDE "engine/events/hidden_events/indigo_plateau_statues.asm"
+INCLUDE "engine/events/hidden_events/book_or_sculpture.asm"
+INCLUDE "engine/events/hidden_events/elevator.asm"
+INCLUDE "engine/events/hidden_events/town_map.asm"
+INCLUDE "engine/events/hidden_events/pokemon_stuff.asm"
 
 
 SECTION "bank4", ROMX
@@ -111,16 +111,16 @@ INCLUDE "engine/movie/oak_speech/clear_save.asm"
 INCLUDE "engine/events/elevator.asm"
 
 
-SECTION "Hidden Objects 1", ROMX
+SECTION "Hidden Events 1", ROMX
 
 INCLUDE "engine/menus/oaks_pc.asm"
-INCLUDE "engine/events/hidden_objects/new_bike.asm"
-INCLUDE "engine/events/hidden_objects/oaks_lab_posters.asm"
-INCLUDE "engine/events/hidden_objects/safari_game.asm"
-INCLUDE "engine/events/hidden_objects/cinnabar_gym_quiz.asm"
-INCLUDE "engine/events/hidden_objects/magazines.asm"
-INCLUDE "engine/events/hidden_objects/bills_house_pc.asm"
-INCLUDE "engine/events/hidden_objects/oaks_lab_email.asm"
+INCLUDE "engine/events/hidden_events/new_bike.asm"
+INCLUDE "engine/events/hidden_events/oaks_lab_posters.asm"
+INCLUDE "engine/events/hidden_events/safari_game.asm"
+INCLUDE "engine/events/hidden_events/cinnabar_gym_quiz.asm"
+INCLUDE "engine/events/hidden_events/magazines.asm"
+INCLUDE "engine/events/hidden_events/bills_house_pc.asm"
+INCLUDE "engine/events/hidden_events/oaks_lab_email.asm"
 
 
 SECTION "Bill's PC", ROMX
@@ -193,13 +193,13 @@ SECTION "Dungeon Warps", ROMX
 INCLUDE "engine/overworld/dungeon_warps.asm"
 
 
-SECTION "Hidden Objects 2", ROMX
+SECTION "Hidden Events 2", ROMX
 
 INCLUDE "engine/events/card_key.asm"
 INCLUDE "engine/events/prize_menu.asm"
-INCLUDE "engine/events/hidden_objects/school_notebooks.asm"
-INCLUDE "engine/events/hidden_objects/fighting_dojo.asm"
-INCLUDE "engine/events/hidden_objects/indigo_plateau_hq.asm"
+INCLUDE "engine/events/hidden_events/school_notebooks.asm"
+INCLUDE "engine/events/hidden_events/fighting_dojo.asm"
+INCLUDE "engine/events/hidden_events/indigo_plateau_hq.asm"
 
 
 SECTION "Battle Engine 7", ROMX
@@ -234,17 +234,17 @@ SECTION "Starter Dex", ROMX
 INCLUDE "engine/events/starter_dex.asm"
 
 
-SECTION "Hidden Objects 3", ROMX
+SECTION "Hidden Events 3", ROMX
 
 INCLUDE "engine/movie/evolution.asm"
 INCLUDE "engine/pokemon/set_types.asm"
-INCLUDE "engine/events/hidden_objects/reds_room.asm"
-INCLUDE "engine/events/hidden_objects/route_15_binoculars.asm"
-INCLUDE "engine/events/hidden_objects/museum_fossils.asm"
-INCLUDE "engine/events/hidden_objects/fanclub_pictures.asm"
-INCLUDE "engine/events/hidden_objects/museum_fossils2.asm"
-INCLUDE "engine/events/hidden_objects/school_blackboard.asm"
-INCLUDE "engine/events/hidden_objects/vermilion_gym_trash.asm"
+INCLUDE "engine/events/hidden_events/reds_room.asm"
+INCLUDE "engine/events/hidden_events/route_15_binoculars.asm"
+INCLUDE "engine/events/hidden_events/museum_fossils.asm"
+INCLUDE "engine/events/hidden_events/fanclub_pictures.asm"
+INCLUDE "engine/events/hidden_events/museum_fossils2.asm"
+INCLUDE "engine/events/hidden_events/school_blackboard.asm"
+INCLUDE "engine/events/hidden_events/vermilion_gym_trash.asm"
 
 
 SECTION "Cinnabar Lab Fossils", ROMX
@@ -252,12 +252,12 @@ SECTION "Cinnabar Lab Fossils", ROMX
 INCLUDE "engine/events/cinnabar_lab.asm"
 
 
-SECTION "Hidden Objects 4", ROMX
+SECTION "Hidden Events 4", ROMX
 
-INCLUDE "engine/events/hidden_objects/gym_statues.asm"
-INCLUDE "engine/events/hidden_objects/bench_guys.asm"
-INCLUDE "engine/events/hidden_objects/blues_room.asm"
-INCLUDE "engine/events/hidden_objects/pokecenter_pc.asm"
+INCLUDE "engine/events/hidden_events/gym_statues.asm"
+INCLUDE "engine/events/hidden_events/bench_guys.asm"
+INCLUDE "engine/events/hidden_events/blues_room.asm"
+INCLUDE "engine/events/hidden_events/pokecenter_pc.asm"
 
 
 SECTION "Version Graphics", ROMX
@@ -352,7 +352,7 @@ INCLUDE "engine/overworld/specific_script_flags.asm"
 
 SECTION "Try Pikachu Movement", ROMX
 
-INCLUDE "engine/overworld/unused_load_missable_object_data.asm"
+INCLUDE "engine/overworld/unused_load_toggleable_object_data.asm"
 INCLUDE "engine/events/try_pikachu_movement.asm"
 
 
@@ -362,10 +362,10 @@ INCLUDE "engine/events/pokecenter_chansey.asm"
 INCLUDE "engine/movie/credits.asm"
 
 
-SECTION "Hidden Objects Core", ROMX
+SECTION "Hidden Events Core", ROMX
 
-INCLUDE "engine/overworld/hidden_objects.asm"
-INCLUDE "engine/events/hidden_objects/vermilion_gym_trash2.asm"
+INCLUDE "engine/overworld/hidden_events.asm"
+INCLUDE "engine/events/hidden_events/vermilion_gym_trash2.asm"
 
 
 SECTION "Battle Engine 8", ROMX