diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index de7b143f..86b6e25a 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -193,7 +193,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	map_const CINNABAR_LAB_FOSSIL_ROOM,       4,  4 ; $AB
 	map_const CINNABAR_POKECENTER,            7,  4 ; $AC
 	map_const CINNABAR_MART,                  4,  4 ; $AD
-	map_const BRUNSWICK_TRAIL,           	 30,  9 ; $AE	- was unused Cinnabar Mart copy
+	map_const BRUNSWICK_TRAIL,           	 31, 12 ; $AE	- was unused Cinnabar Mart copy
 	map_const INDIGO_PLATEAU_LOBBY,           8,  6 ; $AF
 	map_const COPYCATS_HOUSE_1F,              4,  4 ; $B0
 	map_const COPYCATS_HOUSE_2F,              4,  4 ; $B1
diff --git a/data/maps/headers/BrunswickTrail.asm b/data/maps/headers/BrunswickTrail.asm
index 7b1cbc55..69eb75af 100644
--- a/data/maps/headers/BrunswickTrail.asm
+++ b/data/maps/headers/BrunswickTrail.asm
@@ -1,2 +1,2 @@
-	map_header BrunswickTrail, BRUNSWICK_TRAIL, CELESTE, 0
+	map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, 0
 	end_map_header
diff --git a/data/pokemon/tradeback_moves.asm b/data/pokemon/tradeback_moves.asm
index 26ab7e67..ae234e3b 100644
--- a/data/pokemon/tradeback_moves.asm
+++ b/data/pokemon/tradeback_moves.asm
@@ -650,7 +650,7 @@ PsyduckTradebackMoves:
 	db 1, HYPNOSIS
 	db 1, LIGHT_SCREEN
 	db 1, PSYBEAM
-	db 1, PSYCHIC
+	db 1, PSYCHIC_M
 	db 1, PETAL_DANCE
 	db 1, TRI_ATTACK
 	db 0
@@ -1218,7 +1218,7 @@ WeirduckTradebackMoves:
 	db 1, HYPNOSIS
 	db 1, LIGHT_SCREEN
 	db 1, PSYBEAM
-	db 1, PSYCHIC
+	db 1, PSYCHIC_M
 	db 1, PETAL_DANCE
 	db 1, TRI_ATTACK
 	db 0
@@ -1232,7 +1232,7 @@ GolduckTradebackMoves:
 	db 1, HYPNOSIS
 	db 1, LIGHT_SCREEN
 	db 1, PSYBEAM
-	db 1, PSYCHIC
+	db 1, PSYCHIC_M
 	db 1, PETAL_DANCE
 	db 1, TRI_ATTACK
 	db 0
diff --git a/main.asm b/main.asm
index b2d87473..5464fcfd 100644
--- a/main.asm
+++ b/main.asm
@@ -187,11 +187,13 @@ INCLUDE "data/moves/moves.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/cries.asm"
 INCLUDE "engine/battle/unused_stats_functions.asm"
-INCLUDE "engine/pokemon/evos_moves.asm"
 INCLUDE "engine/battle/move_effects/heal.asm"
 INCLUDE "engine/battle/move_effects/transform.asm"
 INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
 
+SECTION "Evos and Moves", ROMX
+
+INCLUDE "engine/pokemon/evos_moves.asm"
 
 SECTION "Battle Core", ROMX