1 files changed, 89 insertions, 89 deletions

diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index aa6cf6310..aefb23c61 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2
 	end
 
 NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA
-	setmaptile 23, 34, 617, 1
-	setmaptile 23, 35, 625, 1
-	setmaptile 23, 36, 621, 0
-	setmaptile 23, 37, 641, 0
-	setmaptile 10, 16, 617, 1
-	setmaptile 10, 17, 625, 1
-	setmaptile 10, 18, 621, 0
-	setmaptile 10, 19, 641, 0
-	setmaptile 10, 0, 617, 1
-	setmaptile 10, 1, 625, 1
-	setmaptile 10, 2, 621, 0
-	setmaptile 10, 3, 641, 0
-	setmaptile 37, 33, 694, 1
-	setmaptile 37, 34, 702, 1
-	setmaptile 37, 35, 710, 1
-	setmaptile 37, 36, 718, 1
-	setmaptile 28, 22, 694, 1
-	setmaptile 28, 23, 702, 1
-	setmaptile 28, 24, 710, 1
-	setmaptile 28, 25, 718, 1
-	setmaptile 10, 24, 694, 1
-	setmaptile 10, 25, 702, 1
-	setmaptile 10, 26, 710, 1
-	setmaptile 10, 27, 718, 1
-	setmaptile 21, 2, 694, 1
-	setmaptile 21, 3, 702, 1
-	setmaptile 21, 4, 710, 1
-	setmaptile 21, 5, 718, 1
-	setmaptile 6, 11, 591, 0
-	setmaptile 13, 10, 591, 0
-	setmaptile 16, 22, 591, 0
-	setmaptile 4, 26, 591, 0
-	setmaptile 30, 38, 591, 0
-	setmaptile 2, 11, 558, 0
-	setmaptile 17, 10, 558, 0
-	setmaptile 25, 18, 558, 0
-	setmaptile 18, 36, 558, 0
+	setmetatile 23, 34, 617, 1
+	setmetatile 23, 35, 625, 1
+	setmetatile 23, 36, 621, 0
+	setmetatile 23, 37, 641, 0
+	setmetatile 10, 16, 617, 1
+	setmetatile 10, 17, 625, 1
+	setmetatile 10, 18, 621, 0
+	setmetatile 10, 19, 641, 0
+	setmetatile 10, 0, 617, 1
+	setmetatile 10, 1, 625, 1
+	setmetatile 10, 2, 621, 0
+	setmetatile 10, 3, 641, 0
+	setmetatile 37, 33, 694, 1
+	setmetatile 37, 34, 702, 1
+	setmetatile 37, 35, 710, 1
+	setmetatile 37, 36, 718, 1
+	setmetatile 28, 22, 694, 1
+	setmetatile 28, 23, 702, 1
+	setmetatile 28, 24, 710, 1
+	setmetatile 28, 25, 718, 1
+	setmetatile 10, 24, 694, 1
+	setmetatile 10, 25, 702, 1
+	setmetatile 10, 26, 710, 1
+	setmetatile 10, 27, 718, 1
+	setmetatile 21, 2, 694, 1
+	setmetatile 21, 3, 702, 1
+	setmetatile 21, 4, 710, 1
+	setmetatile 21, 5, 718, 1
+	setmetatile 6, 11, 591, 0
+	setmetatile 13, 10, 591, 0
+	setmetatile 16, 22, 591, 0
+	setmetatile 4, 26, 591, 0
+	setmetatile 30, 38, 591, 0
+	setmetatile 2, 11, 558, 0
+	setmetatile 17, 10, 558, 0
+	setmetatile 25, 18, 558, 0
+	setmetatile 18, 36, 558, 0
 	return
 
 NewMauville_Inside_EventScript_15E728:: @ 815E728
-	setmaptile 23, 34, 695, 1
-	setmaptile 23, 35, 703, 1
-	setmaptile 23, 36, 711, 1
-	setmaptile 23, 37, 719, 1
-	setmaptile 10, 16, 695, 1
-	setmaptile 10, 17, 703, 1
-	setmaptile 10, 18, 711, 1
-	setmaptile 10, 19, 719, 1
-	setmaptile 10, 0, 695, 1
-	setmaptile 10, 1, 703, 1
-	setmaptile 10, 2, 711, 1
-	setmaptile 10, 3, 719, 1
-	setmaptile 37, 33, 617, 1
-	setmaptile 37, 34, 625, 1
-	setmaptile 37, 35, 621, 0
-	setmaptile 37, 36, 641, 0
-	setmaptile 28, 22, 617, 1
-	setmaptile 28, 23, 625, 1
-	setmaptile 28, 24, 621, 0
-	setmaptile 28, 25, 641, 0
-	setmaptile 10, 24, 617, 1
-	setmaptile 10, 25, 625, 1
-	setmaptile 10, 26, 621, 0
-	setmaptile 10, 27, 641, 0
-	setmaptile 21, 2, 617, 1
-	setmaptile 21, 3, 625, 1
-	setmaptile 21, 4, 621, 0
-	setmaptile 21, 5, 641, 0
-	setmaptile 2, 11, 591, 0
-	setmaptile 17, 10, 591, 0
-	setmaptile 25, 18, 591, 0
-	setmaptile 18, 36, 591, 0
-	setmaptile 6, 11, 566, 0
-	setmaptile 13, 10, 566, 0
-	setmaptile 16, 22, 566, 0
-	setmaptile 4, 26, 566, 0
-	setmaptile 30, 38, 566, 0
+	setmetatile 23, 34, 695, 1
+	setmetatile 23, 35, 703, 1
+	setmetatile 23, 36, 711, 1
+	setmetatile 23, 37, 719, 1
+	setmetatile 10, 16, 695, 1
+	setmetatile 10, 17, 703, 1
+	setmetatile 10, 18, 711, 1
+	setmetatile 10, 19, 719, 1
+	setmetatile 10, 0, 695, 1
+	setmetatile 10, 1, 703, 1
+	setmetatile 10, 2, 711, 1
+	setmetatile 10, 3, 719, 1
+	setmetatile 37, 33, 617, 1
+	setmetatile 37, 34, 625, 1
+	setmetatile 37, 35, 621, 0
+	setmetatile 37, 36, 641, 0
+	setmetatile 28, 22, 617, 1
+	setmetatile 28, 23, 625, 1
+	setmetatile 28, 24, 621, 0
+	setmetatile 28, 25, 641, 0
+	setmetatile 10, 24, 617, 1
+	setmetatile 10, 25, 625, 1
+	setmetatile 10, 26, 621, 0
+	setmetatile 10, 27, 641, 0
+	setmetatile 21, 2, 617, 1
+	setmetatile 21, 3, 625, 1
+	setmetatile 21, 4, 621, 0
+	setmetatile 21, 5, 641, 0
+	setmetatile 2, 11, 591, 0
+	setmetatile 17, 10, 591, 0
+	setmetatile 25, 18, 591, 0
+	setmetatile 18, 36, 591, 0
+	setmetatile 6, 11, 566, 0
+	setmetatile 13, 10, 566, 0
+	setmetatile 16, 22, 566, 0
+	setmetatile 4, 26, 566, 0
+	setmetatile 30, 38, 566, 0
 	return
 
 NewMauville_Inside_EventScript_15E876:: @ 815E876
@@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876
 	end
 
 NewMauville_Inside_EventScript_15E88B:: @ 815E88B
-	setmaptile 33, 6, 591, 0
-	setmaptile 32, 2, 752, 1
-	setmaptile 33, 2, 753, 1
-	setmaptile 34, 2, 754, 1
-	setmaptile 35, 2, 755, 1
-	setmaptile 32, 3, 756, 1
-	setmaptile 33, 3, 757, 1
-	setmaptile 34, 3, 758, 1
-	setmaptile 35, 3, 759, 1
+	setmetatile 33, 6, 591, 0
+	setmetatile 32, 2, 752, 1
+	setmetatile 33, 2, 753, 1
+	setmetatile 34, 2, 754, 1
+	setmetatile 35, 2, 755, 1
+	setmetatile 32, 3, 756, 1
+	setmetatile 33, 3, 757, 1
+	setmetatile 34, 3, 758, 1
+	setmetatile 35, 3, 759, 1
 	special DrawWholeMapView
 	return
 
@@ -166,9 +166,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
@@ -181,9 +181,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
@@ -196,9 +196,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playpokecry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, 2
 	delay 40
-	waitpokecry
+	waitmoncry
 	setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle