diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index bafe7c78..7c4c1624 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -84,8 +84,8 @@ DEF SAFARI_ROCK EQU $16 ; overload
 	const POKE_FLUTE    ; $49
 	const LIFT_KEY      ; $4A
 	const EXP_ALL       ; $4B
-	const OLD_ROD       ; $4C
-	const GOOD_ROD      ; $4D
+	const OLD_ROD       ; $4C - replaceable
+	const GOOD_ROD      ; $4D - replaceable
 	const SUPER_ROD     ; $4E
 	const PP_UP         ; $4F
 	const ETHER         ; $50
diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm
index ee69e444..032f9876 100644
--- a/data/maps/objects/MtMoonCrater.asm
+++ b/data/maps/objects/MtMoonCrater.asm
@@ -8,5 +8,16 @@ MtMoonCrater_Object:
 	def_bg_events
 
 	def_object_events
+	object_event 20, 17, SPRITE_POKE_BALL, STAY, NONE, 1, BLK_AUGURITE
+	object_event 33, 17, SPRITE_FOSSIL, STAY, NONE, 2, DOME_FOSSIL
+	object_event 25, 21, SPRITE_FOSSIL, STAY, NONE, 3, WING_FOSSIL
+	object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 4, HELIX_FOSSIL
+	object_event 26, 20, SPRITE_FOSSIL, STAY, NONE, 5, OLD_AMBER
+	object_event 25,  4, SPRITE_POKE_BALL, STAY, NONE, 6, HYPER_POTION
+	object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 7, MAX_ETHER
+	object_event 44, 17, SPRITE_POKE_BALL, STAY, NONE, 8, MAX_REVIVE
+	object_event 17, 20, SPRITE_POKE_BALL, STAY, NONE, 9, HEART_STONE
+	object_event 20, 20, SPRITE_POKE_BALL, STAY, NONE, 10, POISON_STONE
+	object_event 32, 45, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_ETHER
 
 	def_warps_to MT_MOON_CRATER
\ No newline at end of file
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index 5a49ed7a..8f01b71c 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -994,7 +994,7 @@ BlottleEvosMoves:
 FarfetchdEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 24, MADAAMU
-	db EV_ITEM, HEART_STONE, 1, SIRFETCHD
+	; db EV_ITEM, HEART_STONE, 1, SIRFETCHD
 	db 0
 ; Learnset
 	db 7, LEER
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 2edf0108..27b85c41 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -498,7 +498,7 @@ BlackbeltData:
 ; Fighting Dojo Trainers
 	db 31, CHEEP, CHEEP, JABETTA, 0
 	db 32, MACHOKE, MACHAMP, 0
-	db 36, SIRFETCHD, 0
+	db 36, MACHAMP, 0 ; should be sirfetch'd
 	db 31, MACHOP, MANKEY, PRIMEAPE, 0
 ; Viridian Gym	- changed to fit the Ground-type gym theme
 	db 40, GRAVELER, GOLEM, 0
diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk
index 672ece00..fdc9d044 100644
--- a/maps/MtMoonCrater.blk
+++ b/maps/MtMoonCrater.blk
@@ -2,4 +2,4 @@ AAAAAAAAAAAAAAAAAAAAAAAAAACEEEEEEEEEEEEEEEEEEEEE?AAB.},5

 



~@AAB,

//
 
@AAB9	
),@AAB<=============>@AAB@ACEEEE?AAAAAAB@AAB,@CF}}}DEEEE?AB
@AAB)@B.%,\QQQq@AB
		@AAB)@BZ--v=JAB
@AAB@B"#rk-zG?AB
@AAB@B,012@AB
@AAB.@K>%_
@AB	@AAB)@AB)<=====JAB
@AAB.@AB,@AAAAAAAB
@AAB@AB7DEEEEEEEF

@AAB

@AB	6.)

@AAB

@AB
	5,

@AAB

@AB
 6

D?AB
-@AK==========><N

@AB,@AAAAAAAAAAAAB@K>
@ABDEEEEEEEEEEESFDGF===AB.,.

@AAAACEEAB,)

@CEEEFAAAK=======>Y<===JBAAAAAA
\ No newline at end of file
+@AK==========><>

@AB,@AAAAAAAAAAAAB@K>
@ABDEEEEEEEEEEESFDGF===AB.,.

@AAAACEEAB,)

@CEEEFAAAK=======>Y<===JBAAAAAA
\ No newline at end of file
diff --git a/ram/wram.asm b/ram/wram.asm
index 49d4403d..9ce5f5de 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -2033,7 +2033,9 @@ wCeruleanCaveB1FCurScript:: db
 wVictoryRoad1FCurScript:: db
 wFarawayIslandInsideCurScript:: db ; this should work
 wLancesRoomCurScript:: db
-	ds 4
+wPokemonMansionB2FCurScript:: db
+;wMtMoonCraterCurScript:: db
+	ds 3
 wSilphCo10FCurScript:: db
 wSilphCo11FCurScript:: db
 	ds 1
diff --git a/scripts/MtMoonCrater.asm b/scripts/MtMoonCrater.asm
index 18fb6fa7..436b9b4a 100644
--- a/scripts/MtMoonCrater.asm
+++ b/scripts/MtMoonCrater.asm
@@ -1,6 +1,21 @@
 MtMoonCrater_Script:
 	jp EnableAutoTextBoxDrawing
+	;ld a, [wMtMoonCraterCurScript]
+	;call ExecuteCurMapScriptInTable
+	;ld [wMtMoonCraterCurScript], a
+	;ret
 
 MtMoonCrater_TextPointers:
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
 
 	text_end ; unused
diff --git a/scripts/PokemonMansionB2F.asm b/scripts/PokemonMansionB2F.asm
index b535a4b3..a56ca35f 100644
--- a/scripts/PokemonMansionB2F.asm
+++ b/scripts/PokemonMansionB2F.asm
@@ -1,5 +1,9 @@
 PokemonMansionB2F_Script:
 	jp EnableAutoTextBoxDrawing
+	ld a, [wPokemonMansionB2FCurScript]
+	call ExecuteCurMapScriptInTable
+	ld [wPokemonMansionB2FCurScript], a
+	ret
 
 PokemonMansionB2F_TextPointers:
 	dw B2FBook1