66 files changed, 104 insertions, 103 deletions

diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index d99264136..5d3f23c08 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -250,6 +250,7 @@ const_value SET 1
 	const FRUITTREE_FUCHSIA_CITY  ; 1e
 NUM_FRUIT_TREES EQU const_value +- 1
 
+
 ; elevator floors
 ; used by `elevfloor`
 	const_def
diff --git a/constants/std_constants.asm b/constants/std_constants.asm
index 21fb6791f..efe775c05 100644
--- a/constants/std_constants.asm
+++ b/constants/std_constants.asm
@@ -1,4 +1,4 @@
-; StdScripts indexes (see engine/std_scripts.asm)
+; StdScripts indexes (see events/std_scripts.asm)
 ; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm)
 	enum_start
 	enum pokecenternurse
diff --git a/data/default_names.asm b/data/default_names.asm
new file mode 100644
index 000000000..87c341652
--- /dev/null
+++ b/data/default_names.asm
@@ -0,0 +1,39 @@
+ChrisNameMenuHeader: ; 882b5
+	db $40 ; flags
+	db 00, 00 ; start coords
+	db 11, 10 ; end coords
+	dw .MaleNames
+	db 1 ; ????
+	db 0 ; default option
+
+.MaleNames: ; 882be
+	db $91 ; flags
+	db 5 ; items
+	db "NEW NAME@"
+MalePlayerNameArray: ; 882c9
+	db "CHRIS@"
+	db "MAT@"
+	db "ALLAN@"
+	db "JON@"
+	db 2 ; displacement
+	db " NAME @" ; title
+
+KrisNameMenuHeader: ; 882e5
+	db $40 ; flags
+	db 00, 00 ; start coords
+	db 11, 10 ; end coords
+	dw .FemaleNames
+	db 1 ; ????
+	db 0 ; default option
+
+.FemaleNames: ; 882ee
+	db $91 ; flags
+	db 5 ; items
+	db "NEW NAME@"
+FemalePlayerNameArray: ; 882f9
+	db "KRIS@"
+	db "AMANDA@"
+	db "JUANA@"
+	db "JODI@"
+	db 2 ; displacement
+	db " NAME @" ; title
diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm
index 8aecf2bd0..7ddcaab7c 100644
--- a/data/items/buena_prizes.asm
+++ b/data/items/buena_prizes.asm
@@ -1,5 +1,5 @@
 BuenaPrizeItems: ; 8b15e
-; there are NUM_BUENA_PRIZES items (see event/buena.asm)
+; there are NUM_BUENA_PRIZES items (see events/buena.asm)
 	db ULTRA_BALL,   2
 	db FULL_RESTORE, 2
 	db NUGGET,       3
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 9275c6572..6e346f60d 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a
 
 ## Daisy's grooming doesn't always increase happiness
 
-This is a bug with `MassageOrHaircut` in [event/special.asm](/event/special.asm):
+This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm):
 
 ```asm
 ; Bug: Subtracting $ff from $ff fails to set c.
@@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 
 ## Magikarp lengths can be miscalculated
 
-This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm):
+This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm):
 
 ```asm
 .BCLessThanDE: ; fbc9a
@@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm):
 
 ## `Special_CheckBugContestContestantFlag` can read beyond its data table
 
-In [event/bug_contest_2.asm](/event/bug_contest_2.asm):
+In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm):
 
 ```asm
 Special_CheckBugContestContestantFlag: ; 139ed
diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm
index 1af444d73..6ffaa77c8 100644
--- a/engine/player_gfx.asm
+++ b/engine/player_gfx.asm
@@ -71,45 +71,7 @@ ShowPlayerNamingChoices: ; 88297
 	call CloseWindow
 	ret
 
-ChrisNameMenuHeader: ; 882b5
-	db $40 ; flags
-	db 00, 00 ; start coords
-	db 11, 10 ; end coords
-	dw .MaleNames
-	db 1 ; ????
-	db 0 ; default option
-
-.MaleNames: ; 882be
-	db $91 ; flags
-	db 5 ; items
-	db "NEW NAME@"
-MalePlayerNameArray: ; 882c9
-	db "CHRIS@"
-	db "MAT@"
-	db "ALLAN@"
-	db "JON@"
-	db 2 ; displacement
-	db " NAME @" ; title
-
-KrisNameMenuHeader: ; 882e5
-	db $40 ; flags
-	db 00, 00 ; start coords
-	db 11, 10 ; end coords
-	dw .FemaleNames
-	db 1 ; ????
-	db 0 ; default option
-
-.FemaleNames: ; 882ee
-	db $91 ; flags
-	db 5 ; items
-	db "NEW NAME@"
-FemalePlayerNameArray: ; 882f9
-	db "KRIS@"
-	db "AMANDA@"
-	db "JUANA@"
-	db "JODI@"
-	db 2 ; displacement
-	db " NAME @" ; title
+INCLUDE "data/default_names.asm"
 
 GetPlayerNameArray: ; 88318 This Function is never called
 	ld hl, PlayerName
diff --git a/engine/specials.asm b/engine/specials.asm
index 82b42d8c1..cd2394b96 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -1,4 +1,3 @@
-
 Special:: ; c01b
 ; Run script special de.
 	ld hl, SpecialsPointers
diff --git a/event/basement_key.asm b/events/basement_key.asm
index b15288d09..b15288d09 100755
--- a/event/basement_key.asm
+++ b/events/basement_key.asm
diff --git a/event/battle_tower.asm b/events/battle_tower.asm
index de6022145..de6022145 100644
--- a/event/battle_tower.asm
+++ b/events/battle_tower.asm
diff --git a/event/buena.asm b/events/buena.asm
index 1227593eb..1227593eb 100644
--- a/event/buena.asm
+++ b/events/buena.asm
diff --git a/event/buena_menu.asm b/events/buena_menu.asm
index b453da783..b453da783 100644
--- a/event/buena_menu.asm
+++ b/events/buena_menu.asm
diff --git a/event/bug_contest/caught_mon.asm b/events/bug_contest/caught_mon.asm
index 5d423f466..5d423f466 100644
--- a/event/bug_contest/caught_mon.asm
+++ b/events/bug_contest/caught_mon.asm
diff --git a/event/bug_contest/contest.asm b/events/bug_contest/contest.asm
index ba561abf2..ba561abf2 100644
--- a/event/bug_contest/contest.asm
+++ b/events/bug_contest/contest.asm
diff --git a/event/bug_contest/contest_2.asm b/events/bug_contest/contest_2.asm
index 493c69d0c..493c69d0c 100755
--- a/event/bug_contest/contest_2.asm
+++ b/events/bug_contest/contest_2.asm
diff --git a/event/bug_contest/display_stats.asm b/events/bug_contest/display_stats.asm
index d6ad3997e..d6ad3997e 100644
--- a/event/bug_contest/display_stats.asm
+++ b/events/bug_contest/display_stats.asm
diff --git a/event/bug_contest/judging.asm b/events/bug_contest/judging.asm
index 901ae88fa..901ae88fa 100755
--- a/event/bug_contest/judging.asm
+++ b/events/bug_contest/judging.asm
diff --git a/event/card_key.asm b/events/card_key.asm
index dc4c73ad2..dc4c73ad2 100755
--- a/event/card_key.asm
+++ b/events/card_key.asm
diff --git a/event/catch_tutorial.asm b/events/catch_tutorial.asm
index b9352ccd6..b9352ccd6 100644
--- a/event/catch_tutorial.asm
+++ b/events/catch_tutorial.asm
diff --git a/event/catch_tutorial_input.asm b/events/catch_tutorial_input.asm
index 9d2a03db2..9d2a03db2 100644
--- a/event/catch_tutorial_input.asm
+++ b/events/catch_tutorial_input.asm
diff --git a/event/celebi.asm b/events/celebi.asm
index b7bf95145..b7bf95145 100755
--- a/event/celebi.asm
+++ b/events/celebi.asm
diff --git a/event/unown.asm b/events/crystal_unown.asm
index 6c0e972f8..6c0e972f8 100644
--- a/event/unown.asm
+++ b/events/crystal_unown.asm
diff --git a/event/daycare.asm b/events/daycare.asm
index 6395a40fb..6395a40fb 100755
--- a/event/daycare.asm
+++ b/events/daycare.asm
diff --git a/event/dratini.asm b/events/dratini.asm
index f110b34ab..f110b34ab 100644
--- a/event/dratini.asm
+++ b/events/dratini.asm
diff --git a/event/elevator.asm b/events/elevator.asm
index 9170b642d..9170b642d 100755
--- a/event/elevator.asm
+++ b/events/elevator.asm
diff --git a/event/field_moves.asm b/events/field_moves.asm
index 1c21f4995..1c21f4995 100755
--- a/event/field_moves.asm
+++ b/events/field_moves.asm
diff --git a/engine/fish.asm b/events/fish.asm
index c571bba56..c571bba56 100644
--- a/engine/fish.asm
+++ b/events/fish.asm
diff --git a/event/forced_movement.asm b/events/forced_movement.asm
index 136698501..136698501 100755
--- a/event/forced_movement.asm
+++ b/events/forced_movement.asm
diff --git a/engine/fruit_trees.asm b/events/fruit_trees.asm
index 595e41824..595e41824 100644
--- a/engine/fruit_trees.asm
+++ b/events/fruit_trees.asm
diff --git a/event/halloffame.asm b/events/halloffame.asm
index 5fa1dc270..5fa1dc270 100755
--- a/event/halloffame.asm
+++ b/events/halloffame.asm
diff --git a/event/happiness_egg.asm b/events/happiness_egg.asm
index a1ade1364..a1ade1364 100755
--- a/event/happiness_egg.asm
+++ b/events/happiness_egg.asm
diff --git a/event/heal_machine_anim.asm b/events/heal_machine_anim.asm
index c7789a28d..c7789a28d 100755
--- a/event/heal_machine_anim.asm
+++ b/events/heal_machine_anim.asm
diff --git a/event/itemfinder.asm b/events/itemfinder.asm
index 71aaa5b69..71aaa5b69 100755
--- a/event/itemfinder.asm
+++ b/events/itemfinder.asm
diff --git a/event/kurt.asm b/events/kurt.asm
index 9bc06a613..9bc06a613 100644
--- a/event/kurt.asm
+++ b/events/kurt.asm
diff --git a/event/kurt_selectquantity_interpretjoypad.asm b/events/kurt_selectquantity_interpretjoypad.asm
index 12a43e325..12a43e325 100644
--- a/event/kurt_selectquantity_interpretjoypad.asm
+++ b/events/kurt_selectquantity_interpretjoypad.asm
diff --git a/event/lucky_number.asm b/events/lucky_number.asm
index 4488cfcc9..4488cfcc9 100644
--- a/event/lucky_number.asm
+++ b/events/lucky_number.asm
diff --git a/event/magikarp.asm b/events/magikarp.asm
index 02c4b10cd..02c4b10cd 100644
--- a/event/magikarp.asm
+++ b/events/magikarp.asm
diff --git a/event/magnet_train.asm b/events/magnet_train.asm
index 3a2f902c2..3a2f902c2 100755
--- a/event/magnet_train.asm
+++ b/events/magnet_train.asm
diff --git a/event/misc_scripts.asm b/events/misc_scripts.asm
index 97372a57a..97372a57a 100755
--- a/event/misc_scripts.asm
+++ b/events/misc_scripts.asm
diff --git a/event/misc_scripts_2.asm b/events/misc_scripts_2.asm
index c4c51d5e6..c4c51d5e6 100644
--- a/event/misc_scripts_2.asm
+++ b/events/misc_scripts_2.asm
diff --git a/event/mom.asm b/events/mom.asm
index 6e3c7b320..6e3c7b320 100644
--- a/event/mom.asm
+++ b/events/mom.asm
diff --git a/event/mom_phone.asm b/events/mom_phone.asm
index bef7d5688..bef7d5688 100755
--- a/event/mom_phone.asm
+++ b/events/mom_phone.asm
diff --git a/event/move_deleter.asm b/events/move_deleter.asm
index 95fc0f1d8..95fc0f1d8 100644
--- a/event/move_deleter.asm
+++ b/events/move_deleter.asm
diff --git a/event/move_tutor.asm b/events/move_tutor.asm
index a15ecaf93..a15ecaf93 100644
--- a/event/move_tutor.asm
+++ b/events/move_tutor.asm
diff --git a/event/name_rater.asm b/events/name_rater.asm
index 771c5090a..771c5090a 100644
--- a/event/name_rater.asm
+++ b/events/name_rater.asm
diff --git a/event/overworld.asm b/events/overworld.asm
index 370162fa9..370162fa9 100755
--- a/event/overworld.asm
+++ b/events/overworld.asm
diff --git a/event/poisonstep.asm b/events/poisonstep.asm
index 00c7477bc..00c7477bc 100755
--- a/event/poisonstep.asm
+++ b/events/poisonstep.asm
diff --git a/event/poisonstep_pals.asm b/events/poisonstep_pals.asm
index 088be8848..088be8848 100644
--- a/event/poisonstep_pals.asm
+++ b/events/poisonstep_pals.asm
diff --git a/event/poke_seer.asm b/events/poke_seer.asm
index d6e335298..d6e335298 100644
--- a/event/poke_seer.asm
+++ b/events/poke_seer.asm
diff --git a/engine/pokecenter_pc.asm b/events/pokecenter_pc.asm
index 7045dc1c8..7045dc1c8 100755
--- a/engine/pokecenter_pc.asm
+++ b/events/pokecenter_pc.asm
diff --git a/engine/pokepic.asm b/events/pokepic.asm
index ea5b3c300..ea5b3c300 100755
--- a/engine/pokepic.asm
+++ b/events/pokepic.asm
diff --git a/engine/pokerus/apply_pokerus_tick.asm b/events/pokerus/apply_pokerus_tick.asm
index 3c97fdc5e..3c97fdc5e 100644
--- a/engine/pokerus/apply_pokerus_tick.asm
+++ b/events/pokerus/apply_pokerus_tick.asm
diff --git a/engine/pokerus/check_pokerus.asm b/events/pokerus/check_pokerus.asm
index 285024754..285024754 100644
--- a/engine/pokerus/check_pokerus.asm
+++ b/events/pokerus/check_pokerus.asm
diff --git a/engine/pokerus/pokerus.asm b/events/pokerus/pokerus.asm
index 3e5e094e4..3e5e094e4 100644
--- a/engine/pokerus/pokerus.asm
+++ b/events/pokerus/pokerus.asm
diff --git a/event/print_photo.asm b/events/print_photo.asm
index 06b01bbcf..06b01bbcf 100755
--- a/event/print_photo.asm
+++ b/events/print_photo.asm
diff --git a/event/print_unown.asm b/events/print_unown.asm
index 7841a688b..7841a688b 100644
--- a/event/print_unown.asm
+++ b/events/print_unown.asm
diff --git a/event/print_unown_2.asm b/events/print_unown_2.asm
index 057db5176..057db5176 100644
--- a/event/print_unown_2.asm
+++ b/events/print_unown_2.asm
diff --git a/engine/prof_oaks_pc.asm b/events/prof_oaks_pc.asm
index 69949940b..69949940b 100755
--- a/engine/prof_oaks_pc.asm
+++ b/events/prof_oaks_pc.asm
diff --git a/event/sacred_ash.asm b/events/sacred_ash.asm
index cc46eac9f..cc46eac9f 100755
--- a/event/sacred_ash.asm
+++ b/events/sacred_ash.asm
diff --git a/event/special.asm b/events/special.asm
index d28d0de64..d28d0de64 100755
--- a/event/special.asm
+++ b/events/special.asm
diff --git a/event/squirtbottle.asm b/events/squirtbottle.asm
index 1134f1bb0..1134f1bb0 100755
--- a/event/squirtbottle.asm
+++ b/events/squirtbottle.asm
diff --git a/event/std_collision.asm b/events/std_collision.asm
index 79dbc71f1..79dbc71f1 100644
--- a/event/std_collision.asm
+++ b/events/std_collision.asm
diff --git a/engine/std_scripts.asm b/events/std_scripts.asm
index 297725c60..297725c60 100644
--- a/engine/std_scripts.asm
+++ b/events/std_scripts.asm
diff --git a/event/sweet_scent.asm b/events/sweet_scent.asm
index 77567488c..77567488c 100755
--- a/event/sweet_scent.asm
+++ b/events/sweet_scent.asm
diff --git a/engine/battle/trainer_scripts.asm b/events/trainer_scripts.asm
index 212cd7f28..212cd7f28 100644
--- a/engine/battle/trainer_scripts.asm
+++ b/events/trainer_scripts.asm
diff --git a/event/whiteout.asm b/events/whiteout.asm
index a9d6f900e..a9d6f900e 100755
--- a/event/whiteout.asm
+++ b/events/whiteout.asm
diff --git a/main.asm b/main.asm
index cf9add7cc..3cb765aae 100644
--- a/main.asm
+++ b/main.asm
@@ -13,8 +13,8 @@ INCLUDE "engine/routines/checknickerrors.asm"
 INCLUDE "engine/math.asm"
 INCLUDE "data/items/item_attributes.asm"
 INCLUDE "engine/npc_movement.asm"
-INCLUDE "event/happiness_egg.asm"
-INCLUDE "event/special.asm"
+INCLUDE "events/happiness_egg.asm"
+INCLUDE "events/special.asm"
 
 
 SECTION "bank2", ROMX
@@ -31,14 +31,14 @@ INCLUDE "engine/routines/checktime.asm"
 INCLUDE "engine/specials.asm"
 INCLUDE "engine/printnum.asm"
 INCLUDE "engine/health.asm"
-INCLUDE "event/overworld.asm"
+INCLUDE "events/overworld.asm"
 INCLUDE "engine/items.asm"
 INCLUDE "engine/player_step.asm"
 INCLUDE "engine/battle/anim_hp_bar.asm"
 INCLUDE "engine/move_mon.asm"
 INCLUDE "engine/billspctop.asm"
 INCLUDE "engine/routines/getbreedmonlevelgrowth.asm"
-INCLUDE "event/bug_contest/caught_mon.asm"
+INCLUDE "events/bug_contest/caught_mon.asm"
 INCLUDE "engine/item_effects.asm"
 INCLUDE "engine/battle_anims/getpokeballwobble.asm"
 INCLUDE "engine/routines/knowsmove.asm"
@@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm"
 INCLUDE "engine/time.asm"
 INCLUDE "engine/tmhm.asm"
 INCLUDE "engine/namingscreen.asm"
-INCLUDE "event/misc_scripts.asm"
-INCLUDE "event/heal_machine_anim.asm"
-INCLUDE "event/whiteout.asm"
-INCLUDE "event/forced_movement.asm"
-INCLUDE "event/itemfinder.asm"
+INCLUDE "events/misc_scripts.asm"
+INCLUDE "events/heal_machine_anim.asm"
+INCLUDE "events/whiteout.asm"
+INCLUDE "events/forced_movement.asm"
+INCLUDE "events/itemfinder.asm"
 INCLUDE "engine/start_menu.asm"
 INCLUDE "engine/select_menu.asm"
-INCLUDE "event/elevator.asm"
-INCLUDE "event/bug_contest/contest.asm"
-INCLUDE "event/misc_scripts_2.asm"
-INCLUDE "event/std_collision.asm"
-INCLUDE "event/bug_contest/judging.asm"
-INCLUDE "engine/pokerus/apply_pokerus_tick.asm"
-INCLUDE "event/bug_contest/contest_2.asm"
+INCLUDE "events/elevator.asm"
+INCLUDE "events/bug_contest/contest.asm"
+INCLUDE "events/misc_scripts_2.asm"
+INCLUDE "events/std_collision.asm"
+INCLUDE "events/bug_contest/judging.asm"
+INCLUDE "events/pokerus/apply_pokerus_tick.asm"
+INCLUDE "events/bug_contest/contest_2.asm"
 INCLUDE "engine/routines/correcterrorsinplayerparty.asm"
 INCLUDE "engine/routines/getsquareroot.asm"
 
@@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm"
 INCLUDE "engine/save.asm"
 INCLUDE "engine/spawn_points.asm"
 INCLUDE "engine/map_setup.asm"
-INCLUDE "engine/pokecenter_pc.asm"
+INCLUDE "events/pokecenter_pc.asm"
 INCLUDE "engine/mart.asm"
 INCLUDE "engine/money.asm"
 INCLUDE "data/items/marts.asm"
-INCLUDE "event/mom.asm"
-INCLUDE "event/daycare.asm"
-INCLUDE "event/print_unown.asm"
-INCLUDE "event/print_photo.asm"
+INCLUDE "events/mom.asm"
+INCLUDE "events/daycare.asm"
+INCLUDE "events/print_unown.asm"
+INCLUDE "events/print_photo.asm"
 INCLUDE "engine/breeding.asm"
 
 
@@ -105,7 +105,7 @@ SECTION "bank9", ROMX
 INCLUDE "data/text_buffers.asm"
 INCLUDE "engine/menu.asm"
 INCLUDE "engine/routines/updateitemdescription.asm"
-INCLUDE "engine/pokepic.asm"
+INCLUDE "events/pokepic.asm"
 INCLUDE "engine/map_objects_2.asm"
 INCLUDE "engine/scrolling_menu.asm"
 INCLUDE "engine/switch_items.asm"
@@ -114,7 +114,7 @@ INCLUDE "engine/mon_menu.asm"
 INCLUDE "engine/battle/menu.asm"
 INCLUDE "engine/buy_sell_toss.asm"
 INCLUDE "engine/trainer_card.asm"
-INCLUDE "engine/prof_oaks_pc.asm"
+INCLUDE "events/prof_oaks_pc.asm"
 INCLUDE "engine/decorations.asm"
 INCLUDE "engine/routines/leveluphappinessmod.asm"
 INCLUDE "data/trainers/trainer_dvs.asm"
@@ -122,7 +122,7 @@ INCLUDE "engine/battle/returntobattle_useball.asm"
 INCLUDE "engine/battle/consumehelditem.asm"
 INCLUDE "data/moves/move_effects_pointers.asm"
 INCLUDE "data/moves/move_effects.asm"
-INCLUDE "event/kurt_selectquantity_interpretjoypad.asm"
+INCLUDE "events/kurt_selectquantity_interpretjoypad.asm"
 
 
 SECTION "bankA", ROMX
@@ -143,11 +143,11 @@ SECTION "bankB", ROMX
 INCLUDE "engine/battle/trainer_huds.asm"
 INCLUDE "data/trainers/trainer_class_names.asm"
 INCLUDE "engine/battle/ai/redundant.asm"
-INCLUDE "event/move_deleter.asm"
+INCLUDE "events/move_deleter.asm"
 INCLUDE "engine/mystery_gift_2.asm"
 INCLUDE "engine/tmhm2.asm"
 INCLUDE "data/moves/move_descriptions.asm"
-INCLUDE "engine/pokerus/pokerus.asm"
+INCLUDE "events/pokerus/pokerus.asm"
 INCLUDE "engine/battle/start_battle.asm"
 INCLUDE "engine/routines/placegraphic.asm"
 
@@ -183,7 +183,7 @@ INCLUDE "engine/evolve.asm"
 
 SECTION "bank11", ROMX
 
-INCLUDE "engine/fruit_trees.asm"
+INCLUDE "events/fruit_trees.asm"
 INCLUDE "engine/battle/ai/move.asm"
 INCLUDE "engine/pokedex_2.asm"
 INCLUDE "data/pokemon/dex_entry_pointers.asm"
@@ -194,14 +194,14 @@ SECTION "Crystal Unique", ROMX
 
 INCLUDE "engine/init_gender.asm"
 INCLUDE "engine/routines/drawkrispackgfx.asm"
-INCLUDE "event/move_tutor.asm"
+INCLUDE "events/move_tutor.asm"
 INCLUDE "engine/crystal_colors.asm"
-INCLUDE "event/celebi.asm"
+INCLUDE "events/celebi.asm"
 INCLUDE "engine/main_menu.asm"
 INCLUDE "mobile/mobile_menu.asm"
 INCLUDE "engine/search.asm"
 INCLUDE "mobile/mobile_12_2.asm"
-INCLUDE "event/buena_menu.asm"
+INCLUDE "events/buena_menu.asm"
 
 
 SECTION "bank13", ROMX
@@ -235,12 +235,12 @@ INCLUDE "engine/delete_save_change_clock.asm"
 INCLUDE "tilesets/tilesets.asm"
 INCLUDE "engine/routines/flagpredef.asm"
 INCLUDE "engine/routines/trademonfrontpic.asm"
-INCLUDE "engine/pokerus/check_pokerus.asm"
-INCLUDE "event/lucky_number.asm"
+INCLUDE "events/pokerus/check_pokerus.asm"
+INCLUDE "events/lucky_number.asm"
 INCLUDE "engine/caught_data.asm"
 INCLUDE "engine/search2.asm"
 INCLUDE "engine/stats_screen.asm"
-INCLUDE "event/catch_tutorial.asm"
+INCLUDE "events/catch_tutorial.asm"
 INCLUDE "engine/evolution_animation.asm"
 INCLUDE "engine/init_hof_credits.asm"
 INCLUDE "mobile/get_trainer_class.asm"
@@ -248,18 +248,18 @@ INCLUDE "engine/battle/sliding_intro.asm"
 INCLUDE "mobile/print_opp_message.asm"
 INCLUDE "engine/battle/checkbattlescene.asm"
 INCLUDE "engine/gbc_only.asm"
-INCLUDE "event/poke_seer.asm"
+INCLUDE "events/poke_seer.asm"
 
 
 SECTION "bank14", ROMX
 
 INCLUDE "engine/party_menu.asm"
-INCLUDE "event/poisonstep.asm"
-INCLUDE "event/sweet_scent.asm"
-INCLUDE "event/squirtbottle.asm"
-INCLUDE "event/card_key.asm"
-INCLUDE "event/basement_key.asm"
-INCLUDE "event/sacred_ash.asm"
+INCLUDE "events/poisonstep.asm"
+INCLUDE "events/sweet_scent.asm"
+INCLUDE "events/squirtbottle.asm"
+INCLUDE "events/card_key.asm"
+INCLUDE "events/basement_key.asm"
+INCLUDE "events/sacred_ash.asm"
 INCLUDE "engine/tempmon.asm"
 INCLUDE "engine/types.asm"
 INCLUDE "text/unused_gen_1_trainers.asm"
@@ -309,18 +309,18 @@ SECTION "bank21", ROMX
 
 INCLUDE "engine/printer.asm"
 INCLUDE "gfx/battle_anims.asm"
-INCLUDE "event/halloffame.asm"
+INCLUDE "events/halloffame.asm"
 
 
 SECTION "bank22", ROMX
 
-INCLUDE "event/kurt.asm"
+INCLUDE "events/kurt.asm"
 INCLUDE "engine/player_gfx.asm"
 INCLUDE "mobile/mobile_22.asm"
-INCLUDE "event/unown.asm"
-INCLUDE "event/buena.asm"
-INCLUDE "event/dratini.asm"
-INCLUDE "event/battle_tower.asm"
+INCLUDE "events/crystal_unown.asm"
+INCLUDE "events/buena.asm"
+INCLUDE "events/dratini.asm"
+INCLUDE "events/battle_tower.asm"
 INCLUDE "mobile/mobile_22_2.asm"
 
 
@@ -328,8 +328,8 @@ SECTION "bank23", ROMX
 
 INCLUDE "engine/timeofdaypals.asm"
 INCLUDE "engine/battle/battle_transition.asm"
-INCLUDE "event/field_moves.asm"
-INCLUDE "event/magnet_train.asm"
+INCLUDE "events/field_moves.asm"
+INCLUDE "events/magnet_train.asm"
 INCLUDE "engine/battle/battlestart_copytilemapatonce.asm"
 INCLUDE "engine/sprites.asm"
 INCLUDE "engine/mon_icons.asm"
@@ -340,7 +340,7 @@ SECTION "bank24", ROMX
 INCLUDE "engine/phone/phone.asm"
 INCLUDE "engine/timeset.asm"
 INCLUDE "engine/pokegear.asm"
-INCLUDE "engine/fish.asm"
+INCLUDE "events/fish.asm"
 INCLUDE "engine/slot_machine.asm"
 
 
@@ -381,17 +381,17 @@ INCLUDE "engine/mail_2.asm"
 
 SECTION "bank2F", ROMX
 
-INCLUDE "engine/std_scripts.asm"
+INCLUDE "events/std_scripts.asm"
 INCLUDE "engine/phone/phone_scripts.asm"
 INCLUDE "engine/phone/generic_calls.asm"
-INCLUDE "engine/battle/trainer_scripts.asm"
+INCLUDE "events/trainer_scripts.asm"
 
 
 SECTION "bank32", ROMX
 
 INCLUDE "engine/battle_anims/bg_effects.asm"
 INCLUDE "data/moves/move_anims.asm"
-INCLUDE "event/poisonstep_pals.asm"
+INCLUDE "events/poisonstep_pals.asm"
 
 TheEndGFX:: ; cbd2e
 INCBIN "gfx/credits/theend.2bpp"
@@ -399,7 +399,7 @@ INCBIN "gfx/credits/theend.2bpp"
 
 SECTION "Move Animations", ROMX
 
-INCLUDE "event/bug_contest/display_stats.asm"
+INCLUDE "events/bug_contest/display_stats.asm"
 INCLUDE "engine/battle_anims/anim_commands.asm"
 INCLUDE "engine/battle_anims/engine.asm"
 INCLUDE "data/battle_anims/objects.asm"
@@ -448,7 +448,7 @@ INCLUDE "gfx/pokemon/unown_frames.asm"
 
 SECTION "bank38", ROMX
 
-INCLUDE "event/print_unown_2.asm"
+INCLUDE "events/print_unown_2.asm"
 
 Unknown_e00ed:
 ; Graphics for an unused Game Corner
@@ -477,12 +477,12 @@ SECTION "bank3E", ROMX
 
 INCLUDE "gfx/font.asm"
 INCLUDE "engine/time_capsule.asm"
-INCLUDE "event/name_rater.asm"
+INCLUDE "events/name_rater.asm"
 INCLUDE "engine/routines/playslowcry.asm"
 INCLUDE "engine/routines/newpokedexentry.asm"
 INCLUDE "engine/time_capsule_2.asm"
 INCLUDE "engine/unown_dex.asm"
-INCLUDE "event/magikarp.asm"
+INCLUDE "events/magikarp.asm"
 INCLUDE "engine/battle/hidden_power.asm"
 INCLUDE "engine/battle/misc.asm"
 
@@ -491,7 +491,7 @@ SECTION "bank3F", ROMX
 
 INCLUDE "tilesets/animations.asm"
 INCLUDE "engine/npctrade.asm"
-INCLUDE "event/mom_phone.asm"
+INCLUDE "events/mom_phone.asm"
 
 
 INCLUDE "mobile/mobile_40.asm"
@@ -612,7 +612,7 @@ SECTION "bank77_2", ROMX
 INCLUDE "engine/routines/printhoursmins.asm"
 INCLUDE "engine/diploma.asm"
 INCLUDE "engine/pokedex_3.asm"
-INCLUDE "event/catch_tutorial_input.asm"
+INCLUDE "events/catch_tutorial_input.asm"
 INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm"
 
 PokegearGFX: ; 1de2e4